rpms/kde-filesystem/devel kde-filesystem.spec, 1.4.2.7, 1.4.2.8 macros.kde4, 1.1.2.7, 1.1.2.8

Than Ngo (than) fedora-extras-commits at redhat.com
Thu Aug 9 13:47:31 UTC 2007 

Author: than

Update of /cvs/extras/rpms/kde-filesystem/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv23249

Modified Files:
      Tag: kde-filesystem-kde4-branch
	kde-filesystem.spec macros.kde4 
Log Message:
- use macros



Index: kde-filesystem.spec
===================================================================
RCS file: /cvs/extras/rpms/kde-filesystem/devel/kde-filesystem.spec,v
retrieving revision 1.4.2.7
retrieving revision 1.4.2.8
diff -u -r1.4.2.7 -r1.4.2.8
--- kde-filesystem.spec	9 Aug 2007 13:26:23 -0000	1.4.2.7
+++ kde-filesystem.spec	9 Aug 2007 13:46:58 -0000	1.4.2.8
@@ -1,7 +1,21 @@
+%define _kde4_prefix %_prefix
+%define _kde4_sysconfdir %_sysconfdir
+%define _kde4_libdir %_kde4_prefix/%_lib/kde4
+%define _kde4_datadir %_kde4_prefix/share
+%define _kde4_sharedir %_kde4_prefix/share/kde4
+%define _kde4_iconsdir %_kde4_prefix/share/icons
+%define _kde4_configdir %_kde4_sharedir/config
+%define _kde4_appsdir %_kde4_sharedir/apps
+%define _kde4_docdir %_kde4_prefix/share/doc
+%define _kde4_bindir %_kde4_prefix/bin
+%define _kde4_sbindir %_kde4_prefix/sbin
+%define _kde4_includedir %_kde4_prefix/include
+%define _kde4_debug RelWithDebInfo
+
 Summary: KDE filesystem layout
 Name: kde-filesystem
 Version: 3.92
-Release: 4 
+Release: 5 
 
 Group: System Environment/Base
 License: Public Domain
@@ -31,46 +45,62 @@
 # FIXME/TODO: (re)add kde3-specific dirs -- Rex
 
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rpm \
-      -p $RPM_BUILD_ROOT%{_prefix}/env \
-      -p $RPM_BUILD_ROOT%{_prefix}/shutdown \
-      -p $RPM_BUILD_ROOT%{_sysconfdir}/kde4/env \
-      -p $RPM_BUILD_ROOT%{_sysconfdir}/kde4/shutdown \
-      -p $RPM_BUILD_ROOT%{_sysconfdir}/kde4/kdm \
-      -p $RPM_BUILD_ROOT%{_sysconfdir}/xdg/menus \
-      -p $RPM_BUILD_ROOT%{_libdir}/kde4 \
-      -p $RPM_BUILD_ROOT%{_datadir}/applications/kde4 \
-      -p $RPM_BUILD_ROOT%{_datadir}/kde4/apps \
-      -p $RPM_BUILD_ROOT%{_datadir}/autostart \
-      -p $RPM_BUILD_ROOT%{_datadir}/kde4/config \
-      -p $RPM_BUILD_ROOT%{_datadir}/kde4/config.kcfg \
-      -p $RPM_BUILD_ROOT%{_datadir}/kde4/desktop-directories \
-      -p $RPM_BUILD_ROOT%{_datadir}/kde4/emoticons \
-      -p $RPM_BUILD_ROOT%{_datadir}/kde4/services \
-      -p $RPM_BUILD_ROOT%{_datadir}/kde4/servicetypes \
-      -p $RPM_BUILD_ROOT%{_datadir}/sounds \
-      -p $RPM_BUILD_ROOT%{_datadir}/kde4/templates/.source \
-      -p $RPM_BUILD_ROOT%{_datadir}/wallpapers \
-      -p $RPM_BUILD_ROOT%{_datadir}/icons/locolor/16x16/actions \
-      -p $RPM_BUILD_ROOT%{_datadir}/icons/locolor/16x16/apps \
-      -p $RPM_BUILD_ROOT%{_datadir}/icons/locolor/16x16/mimetypes \
-      -p $RPM_BUILD_ROOT%{_datadir}/icons/locolor/22x22/actions \
-      -p $RPM_BUILD_ROOT%{_datadir}/icons/locolor/22x22/apps \
-      -p $RPM_BUILD_ROOT%{_datadir}/icons/locolor/22x22/mimetypes \
-      -p $RPM_BUILD_ROOT%{_datadir}/icons/locolor/32x32/actions \
-      -p $RPM_BUILD_ROOT%{_datadir}/icons/locolor/32x32/apps \
-      -p $RPM_BUILD_ROOT%{_datadir}/icons/locolor/32x32/mimetypes \
-      -p $RPM_BUILD_ROOT%{_datadir}/icons/locolor/48x48/actions \
-      -p $RPM_BUILD_ROOT%{_datadir}/icons/locolor/48x48/apps \
-      -p $RPM_BUILD_ROOT%{_datadir}/icons/locolor/48x48/mimetypes \
-      -p $RPM_BUILD_ROOT%{_docdir}/HTML/en
+      -p $RPM_BUILD_ROOT%{_kde4_prefix}/env \
+      -p $RPM_BUILD_ROOT%{_kde4_prefix}/shutdown \
+      -p $RPM_BUILD_ROOT%{_kde4_sysconfdir}/kde4/env \
+      -p $RPM_BUILD_ROOT%{_kde4_sysconfdir}/kde4/shutdown \
+      -p $RPM_BUILD_ROOT%{_kde4_sysconfdir}/kde4/kdm \
+      -p $RPM_BUILD_ROOT%{_kde4_sysconfdir}/xdg/menus \
+      -p $RPM_BUILD_ROOT%{_kde4_libdir} \
+      -p $RPM_BUILD_ROOT%{_kde4_datadir}/applications/kde4 \
+      -p $RPM_BUILD_ROOT%{_kde4_appsdir} \
+      -p $RPM_BUILD_ROOT%{_kde4_datadir}/autostart \
+      -p $RPM_BUILD_ROOT%{_kde4_configdir} \
+      -p $RPM_BUILD_ROOT%{_kde4_sharedir}/config.kcfg \
+      -p $RPM_BUILD_ROOT%{_kde4_sharedir}/desktop-directories \
+      -p $RPM_BUILD_ROOT%{_kde4_sharedir}/emoticons \
+      -p $RPM_BUILD_ROOT%{_kde4_sharedir}/services \
+      -p $RPM_BUILD_ROOT%{_kde4_sharedir}/servicetypes \
+      -p $RPM_BUILD_ROOT%{_kde4_datadir}/sounds \
+      -p $RPM_BUILD_ROOT%{_kde4_sharedir}/templates/.source \
+      -p $RPM_BUILD_ROOT%{_kde4_datadir}/wallpapers \
+      -p $RPM_BUILD_ROOT%{_kde4_datadir}/icons/locolor/16x16/actions \
+      -p $RPM_BUILD_ROOT%{_kde4_datadir}/icons/locolor/16x16/apps \
+      -p $RPM_BUILD_ROOT%{_kde4_datadir}/icons/locolor/16x16/mimetypes \
+      -p $RPM_BUILD_ROOT%{_kde4_datadir}/icons/locolor/22x22/actions \
+      -p $RPM_BUILD_ROOT%{_kde4_datadir}/icons/locolor/22x22/apps \
+      -p $RPM_BUILD_ROOT%{_kde4_datadir}/icons/locolor/22x22/mimetypes \
+      -p $RPM_BUILD_ROOT%{_kde4_datadir}/icons/locolor/32x32/actions \
+      -p $RPM_BUILD_ROOT%{_kde4_datadir}/icons/locolor/32x32/apps \
+      -p $RPM_BUILD_ROOT%{_kde4_datadir}/icons/locolor/32x32/mimetypes \
+      -p $RPM_BUILD_ROOT%{_kde4_datadir}/icons/locolor/48x48/actions \
+      -p $RPM_BUILD_ROOT%{_kde4_datadir}/icons/locolor/48x48/apps \
+      -p $RPM_BUILD_ROOT%{_kde4_datadir}/icons/locolor/48x48/mimetypes \
+      -p $RPM_BUILD_ROOT%{_kde4_docdir}/HTML/en
 
 rm -f %{name}.list
 for locale in $(grep '=' %{SOURCE1} | awk -F= '{print $1}') ; do
-  mkdir -p $RPM_BUILD_ROOT%{_docdir}/HTML/${locale}/
-  echo "%lang($locale) %{_docdir}/HTML/$locale/" >> %{name}.list
+  mkdir -p $RPM_BUILD_ROOT%{_kde4_docdir}/HTML/${locale}/
+  echo "%lang($locale) %{_kde4_docdir}/HTML/$locale/" >> %{name}.list
 done
 
-install -p -m644 -D %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.kde4
+# kde rpm macros
+cat >$RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.kde4<<EOF
+%%_kde4_prefix %%_prefix
+%%_kde4_sysconfdir %%_sysconfdir
+%%_kde4_libdir %%_kde4_prefix/%%_lib/kde4
+%%_kde4_datadir %%_kde4_prefix/share
+%%_kde4_sharedir %%_kde4_prefix/share/kde4
+%%_kde4_iconsdir %%_kde4_prefix/share/icons
+%%_kde4_configdir %%_kde4_sharedir/config
+%%_kde4_appsdir %%_kde4_sharedir/apps
+%%_kde4_docdir %_kde4_prefix/share/doc
+%%_kde4_bindir %%_kde4_prefix/bin
+%%_kde4_sbindir %%_kde4_prefix/sbin
+%%_kde4_includedir %%_kde4_prefix/include
+%%_kde4_debug RelWithDebInfo
+EOF
+cat %{SOURCE2} >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.kde4
 
 
 %clean
@@ -80,28 +110,31 @@
 %files -f %{name}.list
 %defattr(-,root,root,-)
 %config /etc/rpm/macros.kde4
-%{_prefix}/env/
-%{_prefix}/shutdown/
+%{_kde4_prefix}/env/
+%{_kde4_prefix}/shutdown/
 %{_sysconfdir}/kde4/
-%{_libdir}/kde4
-%{_datadir}/applications/kde4/
-%{_datadir}/kde4/apps/
-%{_datadir}/kde4/config/
-%{_datadir}/kde4/config.kcfg/
-%{_datadir}/kde4/desktop-directories/
-%{_datadir}/kde4/emoticons/
-%{_datadir}/icons/locolor
-%{_datadir}/kde4/services/
-%{_datadir}/kde4/servicetypes/
-%{_datadir}/kde4/templates/
-%{_datadir}/wallpapers/
-%{_datadir}/sounds/
+%{_kde4_libdir}
+%{_kde4_datadir}/applications/kde4/
+%{_kde4_appsdir}/
+%{_kde4_configdir}/
+%{_kde4_sharedir}/config.kcfg/
+%{_kde4_sharedir}/desktop-directories/
+%{_kde4_sharedir}/emoticons/
+%{_kde4_datadir}/icons/locolor
+%{_kde4_sharedir}/services/
+%{_kde4_sharedir}/servicetypes/
+%{_kde4_sharedir}/templates/
+%{_kde4_datadir}/wallpapers/
+%{_kde4_datadir}/sounds/
 
-%dir %{_docdir}/HTML/
-%lang(en) %{_docdir}/HTML/en/
+%dir %{_kde_docdir}/HTML/
+%lang(en) %{_kde_docdir}/HTML/en/
 
 
 %changelog
+* Thu Aug 09 2007 Than Ngo <than at redhat.com> - 3.92-5
+- use macros
+
 * Thu Aug 09 2007 Than Ngo <than at redhat.com> - 3.92-4
 - fix kde4 macro
 


Index: macros.kde4
===================================================================
RCS file: /cvs/extras/rpms/kde-filesystem/devel/Attic/macros.kde4,v
retrieving revision 1.1.2.7
retrieving revision 1.1.2.8
diff -u -r1.1.2.7 -r1.1.2.8
--- macros.kde4	9 Aug 2007 13:26:23 -0000	1.1.2.7
+++ macros.kde4	9 Aug 2007 13:46:58 -0000	1.1.2.8
@@ -1,16 +1,3 @@
-%_kde4_prefix %_prefix
-%_kde4_sysconfdir %_sysconfdir
-%_kde4_libdir %_kde4_prefix/%_lib/kde4
-%_kde4_datadir %_kde4_prefix/share
-%_kde4_sharedir %_kde4_prefix/share/kde4
-%_kde4_iconsdir %_kde4_prefix/share/icons
-%_kde4_configdir %_kde4_sharedir/config
-%_kde4_appsdir %_kde4_sharedir/apps
-%_kde4_docdir %_kde4_prefix/share/doc
-%_kde4_bindir %_kde4_prefix/bin
-%_kde4_sbindir %_kde4_prefix/sbin
-%_kde4_includedir %_kde4_prefix/include
-%_kde4_debug RelWithDebInfo
 
 %cmake_kde4 \
   QTDIR="%_qt4_prefix" ; export QTDIR ; \

More information about the fedora-extras-commits mailing list