rpms/kde-filesystem/F-8 kde-filesystem.spec, 1.10, 1.11 macros.kde4, 1.3, 1.4
Kevin Kofler (kkofler)
fedora-extras-commits at redhat.com
Thu Jan 10 03:51:47 UTC 2008
Author: kkofler
Update of /cvs/pkgs/rpms/kde-filesystem/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9886/F-8
Modified Files:
kde-filesystem.spec macros.kde4
Log Message:
Sync from devel:
* Mon Jan 07 2008 Rex Dieter <rdieter[AT]fedoraproject.org> 4-6
- -Requires: redhat-rpm-config (revert 4-1 addition)
* Sun Dec 30 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4-5
- +%%_datadir/autostart, %%_kde4_datadir/autostart
* Tue Dec 11 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 4-4
- set INCLUDE_INSTALL_DIR in %%cmake_kde4
* Tue Dec 11 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 4-3
- actually create the directory listed in the file list
* Tue Dec 11 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 4-2
- set kde4_includedir to %%_kde4_prefix/include/kde4
Index: kde-filesystem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-filesystem/F-8/kde-filesystem.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- kde-filesystem.spec 19 Nov 2007 23:02:51 -0000 1.10
+++ kde-filesystem.spec 10 Jan 2008 03:51:14 -0000 1.11
@@ -9,14 +9,14 @@
%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_includedir %_kde4_prefix/include/kde4
%define _kde4_debug RelWithDebInfo
%define _kde4_macros_api 1
Summary: KDE filesystem layout
Name: kde-filesystem
Version: 4
-Release: 1%{?dist}
+Release: 6%{?dist}
Group: System Environment/Base
License: Public Domain
@@ -35,7 +35,7 @@
BuildRequires: gawk
Requires: filesystem
-Requires: rpm redhat-rpm-config
+Requires: rpm
%description
This package provides some directories that are required/used by KDE.
@@ -71,6 +71,7 @@
-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_includedir} \
-p $RPM_BUILD_ROOT%{_kde4_libdir} \
-p $RPM_BUILD_ROOT%{_kde4_datadir}/applications/kde4 \
-p $RPM_BUILD_ROOT%{_kde4_appsdir} \
@@ -116,7 +117,7 @@
%%_kde4_docdir %_kde4_prefix/share/doc
%%_kde4_bindir %%_kde4_prefix/bin
%%_kde4_sbindir %%_kde4_prefix/sbin
-%%_kde4_includedir %%_kde4_prefix/include
+%%_kde4_includedir %%_kde4_prefix/include/kde4
%%_kde4_debug RelWithDebInfo
%%_kde4_macros_api 1
EOF
@@ -135,6 +136,7 @@
%{_datadir}/applications/kde/
%{_datadir}/applnk/
%{_datadir}/apps/
+%{_datadir}/autostart/
%{_datadir}/config/
%{_datadir}/config.kcfg/
%{_datadir}/desktop-directories/
@@ -152,13 +154,15 @@
# KDE4
%config /etc/rpm/macros.kde4
%{_kde4_sysconfdir}/kde4/
-%{_kde4_libdir}
+%{_kde4_libdir}/
+%{_kde4_includedir}/
%{_kde4_datadir}/applications/kde4/
%{_kde4_appsdir}/
%{_kde4_configdir}/
%{_kde4_sharedir}/config.kcfg/
%{_kde4_sharedir}/desktop-directories/
%{_kde4_sharedir}/emoticons/
+%{_kde4_datadir}/autostart/
%{_kde4_datadir}/icons/locolor
%{_kde4_sharedir}/services/
%{_kde4_sharedir}/servicetypes/
@@ -170,6 +174,21 @@
%changelog
+* Mon Jan 07 2008 Rex Dieter <rdieter[AT]fedoraproject.org> 4-6
+- -Requires: redhat-rpm-config (revert 4-1 addition)
+
+* Sun Dec 30 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4-5
+- +%%_datadir/autostart, %%_kde4_datadir/autostart
+
+* Tue Dec 11 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 4-4
+- set INCLUDE_INSTALL_DIR in %%cmake_kde4
+
+* Tue Dec 11 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 4-3
+- actually create the directory listed in the file list
+
+* Tue Dec 11 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 4-2
+- set kde4_includedir to %%_kde4_prefix/include/kde4
+
* Mon Nov 19 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4-1
- Version: 4
- %%cmake_kde4: add -DCMAKE_SKIP_RPATH:BOOL=ON
Index: macros.kde4
===================================================================
RCS file: /cvs/pkgs/rpms/kde-filesystem/F-8/macros.kde4,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- macros.kde4 19 Nov 2007 23:02:51 -0000 1.3
+++ macros.kde4 10 Jan 2008 03:51:14 -0000 1.4
@@ -19,5 +19,6 @@
-DCMAKE_BUILD_TYPE=%{_kde4_debug} \\\
-DCMAKE_INSTALL_PREFIX=%{_kde4_prefix} \\\
-DSYSCONF_INSTALL_DIR=%{_kde4_sysconfdir} \\\
+ -DINCLUDE_INSTALL_DIR=%{_kde4_includedir} \\\
-DLIB_INSTALL_DIR=%{_kde4_libdir} \\\
-DDATA_INSTALL_DIR=%{_kde4_appsdir}
More information about the fedora-extras-commits
mailing list