rpms/gtkhtml3/devel gtkhtml-3.13.1-no-gnome-common.patch, NONE, 1.1 gtkhtml3.spec, 1.76, 1.77

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Fri Oct 27 21:24:40 UTC 2006


Author: mbarnes

Update of /cvs/dist/rpms/gtkhtml3/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv9385

Modified Files:
	gtkhtml3.spec 
Added Files:
	gtkhtml-3.13.1-no-gnome-common.patch 
Log Message:

* Fri Oct 27 2006 Matthew Barnes <mbarnes at redhat.com> - 3.13.1-4.fc7
- Remove gnome-common macros from configure.in.


gtkhtml-3.13.1-no-gnome-common.patch:
 configure.in |    3 ---
 1 files changed, 3 deletions(-)

--- NEW FILE gtkhtml-3.13.1-no-gnome-common.patch ---
--- gtkhtml-3.13.1/configure.in.no-gnome-common	2006-10-27 17:14:24.000000000 -0400
+++ gtkhtml-3.13.1/configure.in	2006-10-27 17:14:30.000000000 -0400
@@ -56,9 +56,6 @@
 AM_CONDITIONAL(OS_WIN32, [test $os_win32 = yes])
 AC_SUBST(SOEXT)
 
-GNOME_COMPILE_WARNINGS(yes)
-CFLAGS="$CFLAGS $warning_flags"
-
 AC_SUBST(CFLAGS)
 AC_SUBST(CPPFLAGS)
 AC_SUBST(LDFLAGS)


Index: gtkhtml3.spec
===================================================================
RCS file: /cvs/dist/rpms/gtkhtml3/devel/gtkhtml3.spec,v
retrieving revision 1.76
retrieving revision 1.77
diff -u -r1.76 -r1.77
--- gtkhtml3.spec	27 Oct 2006 20:37:46 -0000	1.76
+++ gtkhtml3.spec	27 Oct 2006 21:24:38 -0000	1.77
@@ -9,7 +9,7 @@
 
 Name: gtkhtml3
 Version: 3.13.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: LGPL/GPL
 Group: System Environment/Libraries
 Summary: gtkhtml library
@@ -32,6 +32,10 @@
 # Gnome.org bug #363036
 Patch7: gtkhtml-3.13.1-compiler-warnings.patch
 
+# Remove gnome-common macros from configure.in.
+# We do not ship gnome-common (or at least we're not supposed to).
+Patch8: gtkhtml-3.13.1-no-gnome-common.patch
+
 ### Dependencies ###
 
 Requires: gnome-icon-theme >= %{gnome_icon_theme_version}
@@ -73,6 +77,7 @@
 %patch4 -p1 -b .im-too-late
 %patch6 -p1 -b .chain-finalize
 %patch7 -p1 -b .compiler-warnings
+%patch8 -p1 -b .no-gnome-common
 
 %build
 
@@ -138,7 +143,10 @@
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
-* Fri Oct 26 2006 Matthew Barnes <mbarnes at redhat.com> - 3.13.1-3.fc7
+* Fri Oct 27 2006 Matthew Barnes <mbarnes at redhat.com> - 3.13.1-4.fc7
+- Remove gnome-common macros from configure.in.
+
+* Fri Oct 27 2006 Matthew Barnes <mbarnes at redhat.com> - 3.13.1-3.fc7
 - Forgot to commit the patch.
 
 * Tue Oct 17 2006 Matthew Barnes <mbarnes at redhat.com> - 3.13.1-2.fc7




More information about the fedora-cvs-commits mailing list