rpms/kde-filesystem/F-12 kde-filesystem.spec, 1.43, 1.44 macros.kde4, 1.12, 1.13

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kde-filesystem/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1510/F-12

Modified Files:
	kde-filesystem.spec macros.kde4 
Log Message:
sync w/devel for new %%_kde4_version macro



Index: kde-filesystem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-filesystem/F-12/kde-filesystem.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -p -r1.43 -r1.44
--- kde-filesystem.spec	5 Aug 2009 15:34:40 -0000	1.43
+++ kde-filesystem.spec	1 Feb 2010 17:10:34 -0000	1.44
@@ -15,14 +15,14 @@
 %define _kde4_macros_api 2
 
 %if 0%{?fedora} > 11
-# see http://bugzilla.redhat.com/515745
+# moved to filesystem, see http://bugzilla.redhat.com/515745
 %define exclude_sounds 1
 %endif
 
 Summary: KDE filesystem layout
 Name: kde-filesystem
 Version: 4
-Release: 30%{?dist}
+Release: 33%{?dist}
 
 Group: System Environment/Base
 License: Public Domain
@@ -186,6 +186,16 @@ rm -rf $RPM_BUILD_ROOT %{name}.list
 
 
 %changelog
+* Wed Jan 27 2010 Rex Dieter <rdieter at fedoraproject.org> - 4-33
+- macros.kde4: %%{_kde4_version} using (upstreamed) --kde-version now 
+
+* Wed Jan 27 2010 Rex Dieter <rdieter at fedoraproject.org> - 4-32
+- macros.kde4: make %%{_kde4_version} actually work right (using
+  old --version output, for now)
+
+* Wed Jan 27 2010 Rex Dieter <rdieter at fedoraproject.org> - 4-31
+- macros.kde4: +%%{_kde4_version}
+
 * Wed Aug 05 2009 Rex Dieter <rdieter at fedoraproject.org> - 4-30
 - kill the ownership of %%_datadir/sounds (#515745)
 


Index: macros.kde4
===================================================================
RCS file: /cvs/pkgs/rpms/kde-filesystem/F-12/macros.kde4,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- macros.kde4	9 Jan 2009 01:35:58 -0000	1.12
+++ macros.kde4	1 Feb 2010 17:10:34 -0000	1.13
@@ -1,4 +1,7 @@
 
+%_kde4_version %((kde4-config --kde-version 2>/dev/null || echo 4.3.5) | cut -d' ' -f1 )
+#_kde4_version %((kde4-config --version 2>/dev/null || echo "KDE: 4.3.5") | grep '^KDE' | sed -e 's/KDE[^:]*:[ ]*//g' | cut -d' ' -f1)
+
 # api = 2
 # initial try, including only items that vary from defaults
 #