rpms/file-roller/devel gio.patch, NONE, 1.1 file-roller.spec, 1.105, 1.106

[Matthias Clasen (mclasen)]

Author: mclasen

Update of /cvs/extras/rpms/file-roller/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv11292

Modified Files:
	file-roller.spec 
Added Files:
	gio.patch 
Log Message:
rebuild against new nautilus


gio.patch:

--- NEW FILE gio.patch ---
diff -up file-roller-2.20.2/nautilus/Makefile.in.gio file-roller-2.20.2/nautilus/Makefile.in
--- file-roller-2.20.2/nautilus/Makefile.in.gio	2007-12-24 00:18:44.000000000 -0500
+++ file-roller-2.20.2/nautilus/Makefile.in	2007-12-24 00:19:27.000000000 -0500
@@ -255,7 +255,7 @@ INCLUDES = \
 
 
 # FIXME: get this from the .pc file
-nautilus_extensiondir = $(libdir)/nautilus/extensions-1.0
+nautilus_extensiondir = $(libdir)/nautilus/extensions-2.0
 nautilus_extension_LTLIBRARIES = libnautilus-fileroller.la
 libnautilus_fileroller_la_SOURCES = \
 	nautilus-fileroller.c           \
diff -up file-roller-2.20.2/nautilus/Makefile.am.gio file-roller-2.20.2/nautilus/Makefile.am
--- file-roller-2.20.2/nautilus/Makefile.am.gio	2007-12-24 00:19:59.000000000 -0500
+++ file-roller-2.20.2/nautilus/Makefile.am	2007-12-24 00:20:13.000000000 -0500
@@ -13,7 +13,7 @@ INCLUDES =						\
 	$(NAUTILUS_CFLAGS)
 
 # FIXME: get this from the .pc file
-nautilus_extensiondir=$(libdir)/nautilus/extensions-1.0
+nautilus_extensiondir=$(libdir)/nautilus/extensions-2.0
 
 nautilus_extension_LTLIBRARIES=libnautilus-fileroller.la
 


Index: file-roller.spec
===================================================================
RCS file: /cvs/extras/rpms/file-roller/devel/file-roller.spec,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -r1.105 -r1.106
--- file-roller.spec	24 Dec 2007 05:24:04 -0000	1.105
+++ file-roller.spec	24 Dec 2007 05:30:56 -0000	1.106
@@ -72,8 +72,7 @@
 
 rm -rf $RPM_BUILD_ROOT/var/scrollkeeper
 
-rm -f $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-1.0/*.la
-rm -f $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-1.0/*.a
+rm -f $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-2.0/*.{a,la}
 
 rm -f $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/icon-theme.cache
 
@@ -120,7 +119,6 @@
 %doc README COPYING NEWS AUTHORS
 %{_bindir}/file-roller
 %{_datadir}/file-roller
-%{_datadir}/omf/file-roller
 %{_datadir}/applications/gnome-file-roller.desktop
 %{_sysconfdir}/gconf/schemas/file-roller.schemas
 %{_libdir}/nautilus/extensions-2.0/libnautilus-fileroller.so