rpms/gnome-utils/devel gfloppy-libgnome.patch, NONE, 1.1 gnome-utils.spec, 1.177, 1.178

Matthias Clasen mclasen at fedoraproject.org
Tue Dec 23 05:50:58 UTC 2008


Author: mclasen

Update of /cvs/pkgs/rpms/gnome-utils/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19279

Modified Files:
	gnome-utils.spec 
Added Files:
	gfloppy-libgnome.patch 
Log Message:
add bug ref


gfloppy-libgnome.patch:

--- NEW FILE gfloppy-libgnome.patch ---
diff -up gnome-utils-2.25.0/gfloppy/src/Makefile.am.libgnome gnome-utils-2.25.0/gfloppy/src/Makefile.am
--- gnome-utils-2.25.0/gfloppy/src/Makefile.am.libgnome	2008-12-23 00:41:10.000000000 -0500
+++ gnome-utils-2.25.0/gfloppy/src/Makefile.am	2008-12-23 00:41:43.000000000 -0500
@@ -5,6 +5,7 @@ INCLUDES = \
         -DGLADEDIR=\""$(gladedir)"\"           	\
         -DDATADIR=\""$(datadir)"\"		\
 	$(GNOME_UTILS_CFLAGS)			\
+	$(LIBGNOME_CFLAGS)			\
 	$(LIBGLADE_CFLAGS)			\
 	$(HAL_CFLAGS)
 
@@ -25,7 +26,7 @@ gfloppy_SOURCES = \
 	fdformat.c \
 	badblocks.c
 
-gfloppy_LDADD = $(GNOME_UTILS_LIBS) ${LIBGLADE_LIBS} $(HAL_LIBS) -lext2fs
+gfloppy_LDADD = $(GNOME_UTILS_LIBS) $(LIBGNOME_LIBS) ${LIBGLADE_LIBS} $(HAL_LIBS) -lext2fs
 
 gfloppy_LDFLAGS = -export-dynamic
 


Index: gnome-utils.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-utils/devel/gnome-utils.spec,v
retrieving revision 1.177
retrieving revision 1.178
diff -u -r1.177 -r1.178
--- gnome-utils.spec	23 Dec 2008 01:53:42 -0000	1.177
+++ gnome-utils.spec	23 Dec 2008 05:50:28 -0000	1.178
@@ -26,6 +26,8 @@
 Patch2:		logview-versions-crash.patch
 # http://bugzilla.gnome.org/show_bug.cgi?id=497490
 Patch3:		logview-versions-format.patch
+# http://bugzilla.gnome.org/show_bug.cgi?id=565428
+Patch4:		gfloppy-libgnome.patch
 
 BuildRequires:  gnome-doc-utils >= %{gnome_doc_utils_version}
 BuildRequires: 	glib2-devel >= %{glib2_version}
@@ -42,7 +44,7 @@
 BuildRequires:  usermode
 BuildRequires:  gettext
 BuildRequires:  intltool
-BuildRequires:  perl(XML::Parser)
+BuildRequires:	automake autoconf libtool
 
 Requires:	usermode
 
@@ -83,6 +85,7 @@
 %patch1 -p1 -b .logview-scroll
 %patch2 -p1 -b .versions-crash
 %patch3 -p1 -b .versions-format
+%patch4 -p1 -b .gfloppy-libgnome
 
 # Hide from menus
 pushd gsearchtool
@@ -102,6 +105,8 @@
 EOF
 popd
 
+autoreconf -f -i
+
 %build
 %configure --disable-scrollkeeper --enable-console-helper --enable-gfloppy
 make %{?_smp_mflags}




More information about the fedora-extras-commits mailing list