rpms/kde-filesystem/devel kde-filesystem.spec, 1.46, 1.47 macros.kde4, 1.14, 1.15

[Rex Dieter]

Author: rdieter

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

Modified Files:
	kde-filesystem.spec macros.kde4 
Log Message:
* Wed Jan 27 2010 Rex Dieter <rdieter at fedoraproject.org> - 4-33
- macros.kde4: %{_kde4_version} using (upstreamed) --kde-version now 



Index: kde-filesystem.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kde-filesystem/devel/kde-filesystem.spec,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -p -r1.46 -r1.47
--- kde-filesystem.spec	28 Jan 2010 00:02:13 -0000	1.46
+++ kde-filesystem.spec	1 Feb 2010 17:09:01 -0000	1.47
@@ -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: 32%{?dist}
+Release: 33%{?dist}
 
 Group: System Environment/Base
 License: Public Domain
@@ -186,6 +186,9 @@ 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)


Index: macros.kde4
===================================================================
RCS file: /cvs/pkgs/rpms/kde-filesystem/devel/macros.kde4,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -p -r1.14 -r1.15
--- macros.kde4	28 Jan 2010 00:00:53 -0000	1.14
+++ macros.kde4	1 Feb 2010 17:09:01 -0000	1.15
@@ -1,7 +1,6 @@
 
-#_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)
+%_kde4_version %((kde4-config --kde-version 2>/dev/null || echo 4.3.98) | cut -d' ' -f1 )
+#_kde4_version %((kde4-config --version 2>/dev/null || echo "KDE: 4.3.98") | grep '^KDE' | sed -e 's/KDE[^:]*:[ ]*//g' | cut -d' ' -f1)
 
 # api = 2
 # initial try, including only items that vary from defaults