SPECS: kdenetwork-kroupware.spec - some macros updates; isn't this...

qboosh qboosh at pld-linux.org
Mon Dec 19 19:20:39 CET 2005 

Author: qboosh                       Date: Mon Dec 19 18:20:39 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- some macros updates; isn't this spec obsolete?

---- Files affected:
SPECS:
   kdenetwork-kroupware.spec (1.10 -> 1.11) 

---- Diffs:

================================================================
Index: SPECS/kdenetwork-kroupware.spec
diff -u SPECS/kdenetwork-kroupware.spec:1.10 SPECS/kdenetwork-kroupware.spec:1.11
--- SPECS/kdenetwork-kroupware.spec:1.10	Tue Dec 13 13:50:34 2005
+++ SPECS/kdenetwork-kroupware.spec	Mon Dec 19 19:20:34 2005
@@ -25,14 +25,10 @@
 BuildRequires:	libxml2-progs
 BuildRequires:	perl
 BuildRequires:	qt-devel >= 3.1
+BuildRequires:	rpmbuild(macros) >= 1.129
 Provides:	kdenetwork
-BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 Obsoletes:	kdenetwork
-
-%define		_fontdir	/usr/share/fonts
-%define		_htmldir	/usr/share/doc/kde/HTML
-
-%define		no_install_post_chrpath		1
+BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
 KDE network applications. Package includes:
@@ -382,9 +378,7 @@
 %setup -q
 
 %build
-kde_htmldir="%{_htmldir}"; export kde_htmldir
-kde_icondir="%{_pixmapsdir}"; export kde_icondir
-kde_appsdir="%{_applnkdir}"; export kde_appsdir
+kde_htmldir="%{_kdedocdir}"; export kde_htmldir
 kde_cv_utmp_file=/var/run/utmpx ; export kde_cv_utmp_file
 
 #%{__aclocal}
@@ -399,28 +393,13 @@
 
 %install
 rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_sysconfdir}/{rc.d/init.d,sysconfig},%{_bindir}} \
-	$RPM_BUILD_ROOT%{_applnkdir}{/Settings/KDE,/Network/{Communications,M{ail,isc},News}}
+install -d $RPM_BUILD_ROOT{/etc/{rc.d/init.d,sysconfig},%{_desktopdir}}
 
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT
 
-mv $RPM_BUILD_ROOT{%{_bindir}/{,res}lisa,%{_bindir}}
-
-ALD=$RPM_BUILD_ROOT%{_applnkdir}
-
-mv -f $ALD/{Internet,Network/Communications}/ksirc.desktop
-mv -f $ALD/{Internet,Network/Mail}/KMail.desktop
-mv -f $ALD/{Internet,Network/Misc}/Kppp.desktop
-mv -f $ALD/{Internet,Network/Misc}/kget.desktop
-mv -f $ALD/{Internet,Network/Misc}/kit.desktop
-mv -f $ALD/{Internet,Network/Misc}/krdc.desktop
-mv -f $ALD/{Internet,Network/News}/KNode.desktop
-mv -f $ALD/{Internet/More,Network/Mail}/KOrn.desktop
-mv -f $ALD/{Internet/More,Network/Misc}/kppplogview.desktop
-mv -f $ALD/{Internet/More,Network/News}/knewsticker-standalone.desktop
-mv -f $ALD/{Settings/[!K]*,Settings/KDE}
-mv -f $ALD/{System,Network/Misc}/krfb.desktop
+for f in `find $RPM_BUILD_ROOT%{_datadir}/applnk -name '*.desktop'` ; then
+	mv $f $RPM_BUILD_ROOT%{_desktopdir}/kde
 
 install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/lisa
 install %{SOURCE3} $RPM_BUILD_ROOT/etc/sysconfig/lisa
@@ -454,9 +433,9 @@
 %files
 %defattr(644,root,root,755)
 %{_libdir}/libmimelib.la
-%attr(755,root,root) %{_libdir}/libmimelib.so.*
+%attr(755,root,root) %{_libdir}/libmimelib.so.*.*.*
 %{_libdir}/libkdenetwork.la
-%attr(755,root,root) %{_libdir}/libkdenetwork.so.*
+%attr(755,root,root) %{_libdir}/libkdenetwork.so.*.*.*
 %{_libdir}/kde3/kio_sieve.la
 %attr(755,root,root) %{_libdir}/kde3/kio_sieve.so*
 %{_datadir}/services/sieve.protocol
@@ -474,8 +453,8 @@
 %attr(755,root,root) %{_libdir}/kde3/kdict_panelapplet.so
 %{_datadir}/apps/kdict
 %{_datadir}/apps/kicker/applets/kdictapplet.desktop
-%{_pixmapsdir}/*/*/*/kdict*
-%{_applnkdir}/Utilities/kdict.desktop
+%{_iconsdir}/*/*/*/kdict*
+%{_desktopdir}/kde/kdict.desktop
 
 %files kget
 %defattr(644,root,root,755)
@@ -485,8 +464,8 @@
 %{_datadir}/apps/kget
 %{_datadir}/apps/khtml/kpartplugins/kget_plug_in.rc
 %{_datadir}/mimelnk/application/x-kgetlist.desktop
-%{_pixmapsdir}/*/*/*/*kget*
-%{_applnkdir}/Network/Misc/kget.desktop
+%{_iconsdir}/*/*/*/*kget*
+%{_desktopdir}/kde/kget.desktop
 
 %files kinetd
 %defattr(644,root,root,755)
@@ -499,9 +478,9 @@
 %files kit
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/kit
-%{_applnkdir}/Network/Misc/kit.desktop
 %{_datadir}/apps/kit
-%{_pixmapsdir}/*/*/*/kit.png
+%{_desktopdir}/kde/kit.desktop
+%{_iconsdir}/*/*/*/kit.png
 
 %files kmail
 %defattr(644,root,root,755)
@@ -511,14 +490,14 @@
 %attr(755,root,root) %{_bindir}/mail.local
 %{_libdir}/kde3/kfile_rfc822.la
 %attr(755,root,root) %{_libdir}/kde3/kfile_rfc822.so
-%{_applnkdir}/Network/Mail/KMail.desktop
-%{_applnkdir}/Utilities/kmailcvt.desktop
 %{_datadir}/apps/kconf_update/k[!n]*
 %{_datadir}/apps/kconf_update/u*
 %{_datadir}/apps/kgpgcertmanager/kgpgcertmanagerui.rc
 %{_datadir}/apps/kmail
 %{_datadir}/services/kfile_rfc822.desktop
-%{_pixmapsdir}/*/*/*/kmail*.png
+%{_desktopdir}/kde/KMail.desktop
+%{_desktopdir}/kde/kmailcvt.desktop
+%{_iconsdir}/*/*/*/kmail*.png
 
 %files knewsticker
 %defattr(644,root,root,755)
@@ -527,28 +506,28 @@
 %attr(755,root,root) %{_libdir}/kde3/knewsticker_panelapplet.so
 %{_libdir}/kde3/kcm_knewsticker.la
 %attr(755,root,root) %{_libdir}/kde3/kcm_knewsticker.so
-%{_applnkdir}/Settings/KDE/Personalization/kcmnewsticker.desktop
-%{_applnkdir}/Network/News/knewsticker*.desktop
-%{_applnkdir}/.hidden/knewstickerstub.desktop
-%{_applnkdir}/.hidden/kcmnewsticker.desktop
+%{_desktopdir}/kde/kcmnewsticker.desktop
+%{_desktopdir}/kde/knewsticker*.desktop
+%{_datadir}/applnk/.hidden/knewstickerstub.desktop
+%{_datadir}/applnk/.hidden/kcmnewsticker.desktop
 %{_datadir}/services/knewsservice.protocol
 %{_datadir}/apps/knewsticker
 %{_datadir}/apps/kicker/applets/knewsticker.desktop
 %{_datadir}/apps/kconf_update/kn*
-%{_pixmapsdir}/*/*/*/knewsticker.png
+%{_iconsdir}/*/*/*/knewsticker.png
 
 %files knode
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/knode
-%{_applnkdir}/Network/News/KNode.desktop
+%{_desktopdir}/kde/KNode.desktop
 %{_datadir}/apps/knode
-%{_pixmapsdir}/*/*/*/knode.png
+%{_iconsdir}/*/*/*/knode.png
 
 %files korn
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/korn
-%{_applnkdir}/Network/Mail/KOrn.desktop
-%{_pixmapsdir}/*/*/*/korn.png
+%{_desktopdir}/kde/KOrn.desktop
+%{_iconsdir}/*/*/*/korn.png
 
 %files kpf
 %defattr(644,root,root,755)
@@ -558,16 +537,16 @@
 %attr(755,root,root) %{_libdir}/kde3/kpfpropertiesdialog.so
 %{_datadir}/apps/kicker/applets/kpf*
 %{_datadir}/services/kpfpropertiesdialogplugin.desktop
-%{_pixmapsdir}/*/*/*/kpf*
+%{_iconsdir}/*/*/*/kpf*
 
 %files kppp
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/kppplogview
 %attr(755,root,root) %{_bindir}/kppp
-%{_applnkdir}/Network/Misc/Kppp.desktop
-%{_applnkdir}/Network/Misc/kppplogview.desktop
+%{_desktopdir}/kde/Kppp.desktop
+%{_desktopdir}/kde/kppplogview.desktop
 %{_datadir}/apps/kppp
-%{_pixmapsdir}/*/*/*/kppp.png
+%{_iconsdir}/*/*/*/kppp.png
 
 %files krfb
 %defattr(644,root,root,755)
@@ -579,11 +558,11 @@
 %{_datadir}/apps/krfb
 %{_datadir}/services/kinetd_krfb.desktop
 %{_datadir}/services/vnc.protocol
-%{_applnkdir}/Network/Misc/krdc.desktop
-%{_applnkdir}/Network/Misc/krfb.desktop
-%{_applnkdir}/Settings/KDE/Network/kcmkrfb.desktop
-%{_pixmapsdir}/*/*/*/krdc*
-%{_pixmapsdir}/[!l]*/*/*/krfb*
+%{_desktopdir}/kde/krdc.desktop
+%{_desktopdir}/kde/krfb.desktop
+%{_desktopdir}/kde/kcmkrfb.desktop
+%{_iconsdir}/*/*/*/krdc*
+%{_iconsdir}/[!l]*/*/*/krfb*
 
 %files ksirc
 %defattr(644,root,root,755)
@@ -593,11 +572,11 @@
 %attr(755,root,root) %{_libdir}/ksirc.so
 %{_libdir}/libkntsrcfilepropsdlg.la
 %attr(755,root,root) %{_libdir}/libkntsrcfilepropsdlg.so
-%{_applnkdir}/Network/Communications/ksirc.desktop
+%{_desktopdir}/kde/ksirc.desktop
 %{_datadir}/config/ksircrc
 %{_datadir}/apps/ksirc
 %{_datadir}/services/kntsrcfilepropsdlg.desktop
-%{_pixmapsdir}/[!l]*/*/*/ksirc*
+%{_iconsdir}/[!l]*/*/*/ksirc*
 
 %files ktalkd
 %defattr(644,root,root,755)
@@ -606,15 +585,15 @@
 %attr(755,root,root) %{_libdir}/kde3/kcm_ktalkd.so
 %{_datadir}/config/ktalkd*
 %{_datadir}/sounds/ktalkd*
-%{_pixmapsdir}/*/*/*/ktalkd*
-%{_applnkdir}/Settings/KDE/Network/kcmktalkd.desktop
+%{_iconsdir}/*/*/*/ktalkd*
+%{_desktopdir}/kde/kcmktalkd.desktop
 
 %files ktnef
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/ktnef
 %{_libdir}/libktnef.la
 %attr(755,root,root) %{_libdir}/libktnef.so.*
-%{_pixmapsdir}/*/*/*/ktnef*
+%{_iconsdir}/*/*/*/ktnef*
 
 
 %files kxmlrpcd
@@ -641,9 +620,9 @@
 %{_datadir}/services/lan.protocol
 %{_datadir}/apps/lisa
 %{_datadir}/apps/konqueror/dirtree/remote/lan.desktop
-%{_applnkdir}/.hidden/kcmkiolan.desktop
-%{_applnkdir}/.hidden/kcmlisa.desktop
-%{_applnkdir}/.hidden/kcmreslisa.desktop
+%{_datadir}/applnk/.hidden/kcmkiolan.desktop
+%{_datadir}/applnk/.hidden/kcmlisa.desktop
+%{_datadir}/applnk/.hidden/kcmreslisa.desktop
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -651,6 +630,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.11  2005/12/19 18:20:34  qboosh
+- some macros updates; isn't this spec obsolete?
+
 Revision 1.10  2005/12/13 12:50:34  glen
 - adapterized
 - pointless _prefix define removed
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/kdenetwork-kroupware.spec?r1=1.10&r2=1.11&f=u

More information about the pld-cvs-commit mailing list