Browse Source

conflict with nautilus

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@5334 ec354946-7b23-47d6-9f5a-488ba84defc7
Takemikaduchi 12 years ago
parent
commit
c0cee2dabc
1 changed files with 9 additions and 3 deletions
  1. 9 3
      n/nautilus-sendto/nautilus-sendto-vl.spec

+ 9 - 3
n/nautilus-sendto/nautilus-sendto-vl.spec

@@ -3,7 +3,7 @@ Summary(ja):    "ファイルを送る"ための Nautilus コンテキストメ
 
 Name:           nautilus-sendto
 Version:        3.0.1
-Release:        1%{?_dist_release}
+Release:        2%{?_dist_release}
 
 Group:          User Interface/Desktops
 License:        GPLv2+
@@ -70,6 +70,10 @@ make install DESTDIR=$RPM_BUILD_ROOT
 unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
 
 find $RPM_BUILD_ROOT \( -name '*.a' -o -name '*.la' \) -exec rm -f {} \;
+
+#conflict with nautilus
+rm -f $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-3.0/libnautilus-sendto.so
+
 %find_lang %{name}
 
 %clean
@@ -88,7 +92,6 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog ChangeLog.pre-1.1.4.1 COPYING NEWS
-%{_libdir}/nautilus/extensions-3.0/libnautilus-sendto.so
 %dir %{_libdir}/nautilus-sendto
 %dir %{_libdir}/nautilus-sendto/plugins
 %{_libdir}/nautilus-sendto/plugins/*.so
@@ -105,6 +108,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas
 %{_includedir}/nautilus-sendto/nautilus-sendto-plugin.h
 
 %changelog
+* Mon Dec 26 2011 Yoji TOYODA <bsyamato@sea.plala.or.jp> 3.0.1-2
+- remove %%{_libdir}/nautilus/extensions-3.0/libnautilus-sendto.so (conflict with nautilus)
+
 * Fri Nov 25 2011 Toshiharu Kudoh <toshi.kd2@gmail.com> 3.0.1-1
 - new upstream release
 - changed source archive type bz2 to xz
@@ -115,7 +121,7 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas
 - change BuildRequires: gtk3-devel instead of gtk2-devel
 - add BuildRequires: gupnp-devel
 
-* Sun Oct 03 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.32.00-1
+* Sun Oct 03 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 2.32.0-1
 - new upstream release
 - remove BuildRequires: libgnomeui-devel
 - fix %files and scripts