diff --git a/file-roller.spec b/file-roller.spec index f84410f..f4e9d6e 100644 --- a/file-roller.spec +++ b/file-roller.spec @@ -72,8 +72,7 @@ desktop-file-install --vendor gnome --delete-original \ 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 @@ fi %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 diff --git a/gio.patch b/gio.patch new file mode 100644 index 0000000..73567bf --- /dev/null +++ b/gio.patch @@ -0,0 +1,24 @@ +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 +