Author: qboosh                       Date: Sun Feb 20 19:56:58 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- use standard kde_htmldir override, fixed build on amd64

---- Files affected:
SPECS:
   kfstab.spec (1.5 -> 1.6) 

---- Diffs:

================================================================
Index: SPECS/kfstab.spec
diff -u SPECS/kfstab.spec:1.5 SPECS/kfstab.spec:1.6
--- SPECS/kfstab.spec:1.5       Sun Feb 20 20:38:35 2005
+++ SPECS/kfstab.spec   Sun Feb 20 20:56:52 2005
@@ -5,15 +5,17 @@
 Version:       0.7.0
 Release:       2
 License:       GPL v2
-Group:         X11/Applications
 Vendor:                Andreas Reuter <[EMAIL PROTECTED]>
+Group:         X11/Applications
 Source0:       http://dl.sourceforge.net/kfstab/%{name}-%{version}.tgz
 # Source0-md5: 558ecd04b0924df30fd822192422e030
 Patch0:                %{name}-morefilesystems.patch
 Patch1:                %{name}-desktopfile.patch
 URL:           http://kfstab.sourceforge.net/
+BuildRequires: automake
 BuildRequires: gettext-devel
 BuildRequires: kdelibs-devel >= 3.0.0
+BuildRequires: rpmbuild(macros) >= 1.129
 Requires:      kdelibs >= 3.0.0
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -29,20 +31,22 @@
 %patch1 -p1
 
 %build
-%configure
+cp -f /usr/share/automake/config.* admin
+%configure \
+       KDEDIR=%{_libdir} \
+       --with-qt-libraries=%{_libdir}
 %{__make}
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_kdedocdir}}
+install -d $RPM_BUILD_ROOT%{_desktopdir}
 
 %{__make} install \
-       DESTDIR=$RPM_BUILD_ROOT
+       DESTDIR=$RPM_BUILD_ROOT \
+       kde_htmldir=%{_kdedocdir}
 
-mv $RPM_BUILD_ROOT%{_datadir}/applnk/System/%{name}.desktop \
-   $RPM_BUILD_ROOT%{_desktopdir}/%{name}.desktop
-mv $RPM_BUILD_ROOT%{_docdir}/HTML/en \
-   $RPM_BUILD_ROOT%{_kdedocdir}
+mv -f $RPM_BUILD_ROOT%{_datadir}/applnk/System/%{name}.desktop \
+       $RPM_BUILD_ROOT%{_desktopdir}/%{name}.desktop
 
 %find_lang %{name} --with-kde
 
@@ -63,6 +67,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.6  2005/02/20 19:56:52  qboosh
+- use standard kde_htmldir override, fixed build on amd64
+
 Revision 1.5  2005/02/20 19:38:35  qboosh
 - cleanup
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/kfstab.spec?r1=1.5&r2=1.6&f=u


_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to