rpms/kde-filesystem/devel kde-filesystem.spec, 1.44, 1.45 macros.kde4, 1.13, 1.14

[Rex Dieter]

Author: rdieter

Update of /cvs/pkgs/rpms/kde-filesystem/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3607

Modified Files:
	kde-filesystem.spec macros.kde4 
Log Message:
(makes me wonder if we should just make this static, and put it
into kdelibs packaging... this may be more trouble than it's worth)

* 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)



Index: kde-filesystem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-filesystem/devel/kde-filesystem.spec,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -p -r1.44 -r1.45
--- kde-filesystem.spec	27 Jan 2010 17:06:24 -0000	1.44
+++ kde-filesystem.spec	28 Jan 2010 00:00:52 -0000	1.45
@@ -186,6 +186,10 @@ rm -rf $RPM_BUILD_ROOT %{name}.list
 
 
 %changelog
+* 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}
 


Index: macros.kde4
===================================================================
RCS file: /cvs/pkgs/rpms/kde-filesystem/devel/macros.kde4,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -p -r1.13 -r1.14
--- macros.kde4	27 Jan 2010 17:06:24 -0000	1.13
+++ macros.kde4	28 Jan 2010 00:00:53 -0000	1.14
@@ -1,5 +1,7 @@
 
-%_kde4_version %(kde4-config --kde-version 2>/dev/null || echo 4.3.95 )
+#_kde4_version %((kde4-config --kde-version 2>/dev/null || echo 4.3.95) | cut -d' ' -f1 )
+#_kde4_version %((kde4-config --version 2>/dev/null || echo "KDE: 4.3.95") | grep '^KDE' | cut -d':' -f2 | cut -d' ' -f2)
+%_kde4_version %((kde4-config --version 2>/dev/null || echo "KDE: 4.3.95") | grep '^KDE' | sed -e 's/KDE[^:]*:[ ]*//g' | cut -d' ' -f1)
 
 # api = 2
 # initial try, including only items that vary from defaults