rpms/kde-filesystem/devel macros.kde4, 1.1, 1.2 kde-filesystem.spec, 1.8, 1.9

Kevin Kofler (kkofler) fedora-extras-commits at redhat.com
Tue Sep 18 01:38:58 UTC 2007 

Author: kkofler

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

Modified Files:
	kde-filesystem.spec 
Added Files:
	macros.kde4 
Log Message:
Merge changes from kde-filesystem-kde4-branch.

kde-filesystem now contains the required directories and RPM macros for both KDE 3 and 4, which allows adding parallel-installable KDE 4 development platform packages. (No dependency on KDE 4 is introduced, so there should be no noticeable changes for KDE 3 only users.)


Index: macros.kde4
===================================================================
RCS file: macros.kde4
diff -N macros.kde4
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ macros.kde4	18 Sep 2007 01:38:25 -0000	1.2
@@ -0,0 +1,19 @@
+
+# api = 1
+# initial try, including only items that vary from defaults
+
+%cmake_kde4 \
+  QTDIR="%{_qt4_prefix}" ; export QTDIR ; \
+  PATH="%{_qt4_bindir}:$PATH" ; export PATH ; \
+  CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; \
+  CXXFLAGS="${CXXFLAGS:-%optflags}" ; export CXXFLAGS ; \
+  FFLAGS="${FFLAGS:-%optflags}" ; export FFLAGS ; \
+  %{__cmake} \\\
+  %if "%{_lib}" == "lib64" \
+    -DLIB_SUFFIX=64 \\\
+  %endif \
+  -DCMAKE_BUILD_TYPE=%{_kde4_debug} \\\
+  -DCMAKE_INSTALL_PREFIX=%{_kde4_prefix} \\\
+  -DSYSCONF_INSTALL_DIR=%{_kde4_sysconfdir} \\\
+  -DLIB_INSTALL_DIR=%{_kde4_libdir} \\\
+  -DDATA_INSTALL_DIR=%{_kde4_appsdir}


Index: kde-filesystem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-filesystem/devel/kde-filesystem.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- kde-filesystem.spec	27 Aug 2007 15:51:59 -0000	1.8
+++ kde-filesystem.spec	18 Sep 2007 01:38:25 -0000	1.9
@@ -1,23 +1,41 @@
+%define _kde4_prefix %_prefix
+%define _kde4_sysconfdir %_sysconfdir
+%define _kde4_libdir %_libdir
+%define _kde4_datadir %_datadir
+%define _kde4_sharedir %_datadir
+%define _kde4_iconsdir %_kde4_sharedir/icons
+%define _kde4_configdir %_kde4_sharedir/config
+%define _kde4_appsdir %_kde4_sharedir/kde4/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
+%define _kde4_macros_api 1
 
 Summary: KDE filesystem layout
-Name:	 kde-filesystem
-Version: 3.5 
-Release: 13%{?dist}
+Name: kde-filesystem
+Version: 3.92
+Release: 9%{?dist}
 
-Group:   System Environment/Base
+Group: System Environment/Base
 License: Public Domain
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 
-# Consider -- Rex
-#Provides: kde3-filesystem = %{version}-%{release}
-
 # teamnames (locales) borrowed from kde-i18n packaging
 Source1: teamnames
 
+Source2: macros.kde4
+# increment whenever dirs change in an incompatible way
+# kde4 apps built using macros.kde4 should
+# Requires: kde4-macros(api) = %{_kde4_macros_api}
+Provides: kde4-macros(api) = %{_kde4_macros_api} 
+
 BuildRequires: gawk
 
 Requires:  filesystem
+Requires:  rpm
 
 %description
 This package provides some directories that are required/used by KDE. 
@@ -33,6 +51,7 @@
 rm -f $RPM_BUILD_DIR/%{name}.list
 rm -rf $RPM_BUILD_ROOT
 
+## KDE3 
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/kde/{env,shutdown,kdm,xdg/menus}
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/{applications/kde,applnk,apps,autostart,config,config.kcfg,desktop-directories,emoticons,mimelnk,services,servicetypes,sounds,templates,source,wallpapers}
 # not sure who best should own locolor, so we'll included it here, for now. -- Rex
@@ -46,13 +65,72 @@
   echo "%lang($locale) %{_docdir}/HTML/$locale/" >> %{name}.list
 done
 
+## KDE4
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/rpm \
+      -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
+
+for locale in $(grep '=' %{SOURCE1} | awk -F= '{print $1}') ; do
+  mkdir -p $RPM_BUILD_ROOT%{_kde4_docdir}/HTML/${locale}/
+  echo "%lang($locale) %{_kde4_docdir}/HTML/$locale/" >> %{name}.list
+done
+
+# rpm macros
+cat >$RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.kde4<<EOF
+%%_kde4_prefix %%_prefix
+%%_kde4_sysconfdir %%_sysconfdir
+%%_kde4_libdir %%_libdir
+%%_kde4_datadir %%_datadir
+%%_kde4_sharedir %%_datadir
+%%_kde4_iconsdir %%_kde4_sharedir/icons
+%%_kde4_configdir %%_kde4_sharedir/config
+%%_kde4_appsdir %%_kde4_sharedir/kde4/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
+%%_kde4_macros_api 1
+EOF
+cat %{SOURCE2} >> $RPM_BUILD_ROOT%{_sysconfdir}/rpm/macros.kde4
+
+
 %clean
-rm -rf $RPM_BUILD_ROOT
-rm -f  $RPM_BUILD_DIR/%{name}.list
+rm -rf $RPM_BUILD_ROOT %{name}.list
 
 
 %files -f %{name}.list
 %defattr(-,root,root,-)
+
+# KDE3
 %{_sysconfdir}/kde/
 %{_datadir}/applications/kde/
 %{_datadir}/applnk/
@@ -71,22 +149,59 @@
 %dir %{_docdir}/HTML/
 %lang(en) %{_docdir}/HTML/en/
 
+# KDE4
+%config /etc/rpm/macros.kde4
+%{_kde4_sysconfdir}/kde4/
+%{_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 %{_kde4_docdir}/HTML/
+%lang(en) %{_kde4_docdir}/HTML/en/
+
 
 %changelog
-* Mon Aug 27 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.5-13
+* Mon Aug 27 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.92-9
 - BR: gawk
-
-* Mon Aug 27 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.5-12
 - - %%_prefix/{env,shutdown} (non-FHS)
 
-* Fri Aug 17 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.5-11
-- fix templates.source typo
+* Wed Aug 15 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.92-8
+- simplify macros a bit
+
+* Tue Aug 14 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.92-7
+- kde4-macros(api), %%_kde4_macros_api
+
+* Fri Aug 10 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.92-6
+- restore kde3 dirs
+
+* 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
+
+* Thu Aug 09 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.92-3
+- cleanup macros.kde4 (mostly use _kde4_ prefix)
+- Requires: rpm
+
+* Tue Aug 07 2007 Than Ngo <than at redhat.com> 3.92-2
+- add missing macros.kde4
 
-* Fri Aug 17 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.5-10
-- +disttag
+* Mon Aug 06 2007 Than Ngo <than at redhat.com> - 3.92-1
+- kde4 filesystem
+- add KDE4 macros
 
 * Thu Jul 19 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.5-9
-- +%%_datadir/{sounds,templates,source,wallpapers}
+- +%%_datadir/{sounds,templates/.source,wallpapers}
 
 * Wed Jul 18 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.5-8
 - +%%_datadir/{autostart,emoticons,mimelnk/*}

More information about the fedora-extras-commits mailing list