rpms/kde-filesystem/F-8 kde-filesystem.spec, 1.9, 1.10 macros.kde4, 1.2, 1.3

[Kevin Kofler (kkofler)]

Author: kkofler

Update of /cvs/pkgs/rpms/kde-filesystem/F-8
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29555/F-8

Modified Files:
	kde-filesystem.spec macros.kde4 
Log Message:
* Mon Nov 19 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4-1
- Version: 4
- %%cmake_kde4: add -DCMAKE_SKIP_RPATH:BOOL=ON
- Requires: redhat-rpm-config (for proper rpm macro defs)
  (hmm... may need a new -devel pkg somewhere)


Index: kde-filesystem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-filesystem/F-8/kde-filesystem.spec,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- kde-filesystem.spec	18 Sep 2007 01:38:25 -0000	1.9
+++ kde-filesystem.spec	19 Nov 2007 23:02:51 -0000	1.10
@@ -15,8 +15,8 @@
 
 Summary: KDE filesystem layout
 Name: kde-filesystem
-Version: 3.92
-Release: 9%{?dist}
+Version: 4 
+Release: 1%{?dist}
 
 Group: System Environment/Base
 License: Public Domain
@@ -35,7 +35,7 @@
 BuildRequires: gawk
 
 Requires:  filesystem
-Requires:  rpm
+Requires:  rpm redhat-rpm-config
 
 %description
 This package provides some directories that are required/used by KDE. 
@@ -170,6 +170,12 @@
 
 
 %changelog
+* Mon Nov 19 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 4-1
+- Version: 4
+- %%cmake_kde4: add -DCMAKE_SKIP_RPATH:BOOL=ON
+- Requires: redhat-rpm-config (for proper rpm macro defs)
+  (hmm... may need a new -devel pkg somewhere)
+
 * Mon Aug 27 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.92-9
 - BR: gawk
 - - %%_prefix/{env,shutdown} (non-FHS)


Index: macros.kde4
===================================================================
RCS file: /cvs/pkgs/rpms/kde-filesystem/F-8/macros.kde4,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- macros.kde4	18 Sep 2007 01:38:25 -0000	1.2
+++ macros.kde4	19 Nov 2007 23:02:51 -0000	1.3
@@ -1,6 +1,9 @@
 
 # api = 1
 # initial try, including only items that vary from defaults
+#
+
+%_cmake_skip_rpath -DCMAKE_SKIP_RPATH:BOOL=ON 
 
 %cmake_kde4 \
   QTDIR="%{_qt4_prefix}" ; export QTDIR ; \
@@ -12,6 +15,7 @@
   %if "%{_lib}" == "lib64" \
     -DLIB_SUFFIX=64 \\\
   %endif \
+  %{?_cmake_skip_rpath} \\\
   -DCMAKE_BUILD_TYPE=%{_kde4_debug} \\\
   -DCMAKE_INSTALL_PREFIX=%{_kde4_prefix} \\\
   -DSYSCONF_INSTALL_DIR=%{_kde4_sysconfdir} \\\