[gnomeradio] Revert "* Fri Aug 20 2010 Dominik Mierzejewski <rpm at greysector.net> - 1.8-8"

Dominik Mierzejewski rathann at fedoraproject.org
Mon Aug 23 17:19:44 UTC 2010 

commit a7e909a843b91429edcfad7c0252461a7d7aa766
Author: Dominik Mierzejewski <dominik at greysector.net>
Date:   Mon Aug 23 19:17:19 2010 +0200

    Revert "* Fri Aug 20 2010 Dominik Mierzejewski <rpm at greysector.net> - 1.8-8"
    
    This reverts commit 8577e67a74a10ebe6b0de522c529e9f292f3037c.

 gnomeradio-gnome-3.0.patch |   62 ++++++++++++++++++++++++++++++++++++++++++++
 gnomeradio.spec            |    7 ++---
 2 files changed, 65 insertions(+), 4 deletions(-)
---
diff --git a/gnomeradio-gnome-3.0.patch b/gnomeradio-gnome-3.0.patch
new file mode 100644
index 0000000..61ff98d
--- /dev/null
+++ b/gnomeradio-gnome-3.0.patch
@@ -0,0 +1,62 @@
+diff -up gnomeradio-1.8/configure.gnome-3.0 gnomeradio-1.8/configure
+--- gnomeradio-1.8/configure.gnome-3.0	2008-09-13 17:57:42.000000000 +0200
++++ gnomeradio-1.8/configure	2010-08-01 22:45:56.000000000 +0200
+@@ -22936,12 +22936,12 @@ if test -n "$PKG_CONFIG"; then
+         pkg_cv_GNOME_CFLAGS="$GNOME_CFLAGS"
+     else
+         if test -n "$PKG_CONFIG" && \
+-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnomeui-2.0 >= 2.12 gconf-2.0 >= 2.12 gnome-vfs-2.0 >= 2.12 gnome-media-profiles >= 2.12\"") >&5
+-  ($PKG_CONFIG --exists --print-errors "libgnomeui-2.0 >= 2.12 gconf-2.0 >= 2.12 gnome-vfs-2.0 >= 2.12 gnome-media-profiles >= 2.12") 2>&5
++    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnomeui-2.0 >= 2.12 gconf-2.0 >= 2.12 gnome-vfs-2.0 >= 2.12 gnome-media-profiles-3.0 >= 2.12\"") >&5
++  ($PKG_CONFIG --exists --print-errors "libgnomeui-2.0 >= 2.12 gconf-2.0 >= 2.12 gnome-vfs-2.0 >= 2.12 gnome-media-profiles-3.0 >= 2.12") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-  pkg_cv_GNOME_CFLAGS=`$PKG_CONFIG --cflags "libgnomeui-2.0 >= 2.12 gconf-2.0 >= 2.12 gnome-vfs-2.0 >= 2.12 gnome-media-profiles >= 2.12" 2>/dev/null`
++  pkg_cv_GNOME_CFLAGS=`$PKG_CONFIG --cflags "libgnomeui-2.0 >= 2.12 gconf-2.0 >= 2.12 gnome-vfs-2.0 >= 2.12 gnome-media-profiles-3.0 >= 2.12" 2>/dev/null`
+ else
+   pkg_failed=yes
+ fi
+@@ -22954,12 +22954,12 @@ if test -n "$PKG_CONFIG"; then
+         pkg_cv_GNOME_LIBS="$GNOME_LIBS"
+     else
+         if test -n "$PKG_CONFIG" && \
+-    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnomeui-2.0 >= 2.12 gconf-2.0 >= 2.12 gnome-vfs-2.0 >= 2.12 gnome-media-profiles >= 2.12\"") >&5
+-  ($PKG_CONFIG --exists --print-errors "libgnomeui-2.0 >= 2.12 gconf-2.0 >= 2.12 gnome-vfs-2.0 >= 2.12 gnome-media-profiles >= 2.12") 2>&5
++    { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libgnomeui-2.0 >= 2.12 gconf-2.0 >= 2.12 gnome-vfs-2.0 >= 2.12 gnome-media-profiles-3.0 >= 2.12\"") >&5
++  ($PKG_CONFIG --exists --print-errors "libgnomeui-2.0 >= 2.12 gconf-2.0 >= 2.12 gnome-vfs-2.0 >= 2.12 gnome-media-profiles-3.0 >= 2.12") 2>&5
+   ac_status=$?
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
+   (exit $ac_status); }; then
+-  pkg_cv_GNOME_LIBS=`$PKG_CONFIG --libs "libgnomeui-2.0 >= 2.12 gconf-2.0 >= 2.12 gnome-vfs-2.0 >= 2.12 gnome-media-profiles >= 2.12" 2>/dev/null`
++  pkg_cv_GNOME_LIBS=`$PKG_CONFIG --libs "libgnomeui-2.0 >= 2.12 gconf-2.0 >= 2.12 gnome-vfs-2.0 >= 2.12 gnome-media-profiles-3.0 >= 2.12" 2>/dev/null`
+ else
+   pkg_failed=yes
+ fi
+@@ -22978,14 +22978,14 @@ else
+         _pkg_short_errors_supported=no
+ fi
+         if test $_pkg_short_errors_supported = yes; then
+-	        GNOME_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libgnomeui-2.0 >= 2.12 gconf-2.0 >= 2.12 gnome-vfs-2.0 >= 2.12 gnome-media-profiles >= 2.12"`
++	        GNOME_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libgnomeui-2.0 >= 2.12 gconf-2.0 >= 2.12 gnome-vfs-2.0 >= 2.12 gnome-media-profiles-3.0 >= 2.12"`
+         else
+-	        GNOME_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgnomeui-2.0 >= 2.12 gconf-2.0 >= 2.12 gnome-vfs-2.0 >= 2.12 gnome-media-profiles >= 2.12"`
++	        GNOME_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libgnomeui-2.0 >= 2.12 gconf-2.0 >= 2.12 gnome-vfs-2.0 >= 2.12 gnome-media-profiles-3.0 >= 2.12"`
+         fi
+ 	# Put the nasty error message in config.log where it belongs
+ 	echo "$GNOME_PKG_ERRORS" >&5
+ 
+-	{ { echo "$as_me:$LINENO: error: Package requirements (libgnomeui-2.0 >= 2.12 gconf-2.0 >= 2.12 gnome-vfs-2.0 >= 2.12 gnome-media-profiles >= 2.12) were not met:
++	{ { echo "$as_me:$LINENO: error: Package requirements (libgnomeui-2.0 >= 2.12 gconf-2.0 >= 2.12 gnome-vfs-2.0 >= 2.12 gnome-media-profiles-3.0 >= 2.12) were not met:
+ 
+ $GNOME_PKG_ERRORS
+ 
+@@ -22996,7 +22996,7 @@ Alternatively, you may set the environme
+ and GNOME_LIBS to avoid the need to call pkg-config.
+ See the pkg-config man page for more details.
+ " >&5
+-echo "$as_me: error: Package requirements (libgnomeui-2.0 >= 2.12 gconf-2.0 >= 2.12 gnome-vfs-2.0 >= 2.12 gnome-media-profiles >= 2.12) were not met:
++echo "$as_me: error: Package requirements (libgnomeui-2.0 >= 2.12 gconf-2.0 >= 2.12 gnome-vfs-2.0 >= 2.12 gnome-media-profiles-3.0 >= 2.12) were not met:
+ 
+ $GNOME_PKG_ERRORS
+ 
diff --git a/gnomeradio.spec b/gnomeradio.spec
index 56cdaeb..4fe785b 100644
--- a/gnomeradio.spec
+++ b/gnomeradio.spec
@@ -1,7 +1,7 @@
 Summary: Graphical FM-Tuner program for GNOME
 Name: gnomeradio
 Version: 1.8
-Release: 8%{?dist}
+Release: 7%{?dist}
 License: GPLv2+
 Group: Applications/Multimedia
 URL: http://projects.gnome.org/gnomeradio/
@@ -11,6 +11,7 @@ Patch0: %{name}-v4l2.patch
 Patch1: %{name}-ld.patch
 # http://git.gnome.org/browse/gnomeradio/commit/?id=7694c70f99731724dad64444484d070ff760db89
 Patch2: %{name}-crash.patch
+Patch3: %{name}-gnome-3.0.patch
 Patch4: %{name}-gtk.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: desktop-file-utils
@@ -40,6 +41,7 @@ Ogg files.
 %patch0 -p1 -b .v4l2
 %patch1 -p1 -b .ld
 %patch2 -p1 -b .crash
+%patch3 -p1 -b .gnome-3.0
 %patch4 -p1 -b .gtk
 %{__install} -m 755 %{SOURCE1} .
 
@@ -116,9 +118,6 @@ scrollkeeper-update -q || :
 %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
 
 %changelog
-* Fri Aug 20 2010 Dominik Mierzejewski <rpm at greysector.net> - 1.8-8
-- revert GNOME-3.0 patch
-
 * Thu Jul 15 2010 Dominik Mierzejewski <rpm at greysector.net> - 1.8-7
 - rebuild against new gnome-media-libs
 - fix build with current GNOME and GTK2

More information about the scm-commits mailing list