rpms/nautilus-share/F-10 nautilus-share-fix-icon.patch, NONE, 1.1 nautilus-share-moveto-extentions2.patch, NONE, 1.1 nautilus-share.spec, 1.2, 1.3

[Jesse Keating]

Author: jkeating

Update of /cvs/pkgs/rpms/nautilus-share/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv13008

Modified Files:
	nautilus-share.spec 
Added Files:
	nautilus-share-fix-icon.patch 
	nautilus-share-moveto-extentions2.patch 
Log Message:
* Wed Nov 12 2008 Muayyad Saleh Alsadi <alsadi at ojuba.org> - 0.7.2-13
- set icon to "folder-remote"
- don't use extensions-1.0 directory (fixes #447072)


nautilus-share-fix-icon.patch:

--- NEW FILE nautilus-share-fix-icon.patch ---
diff -Naur nautilus-share-0.7.2.orig/src/nautilus-share.c nautilus-share-0.7.2/src/nautilus-share.c
--- nautilus-share-0.7.2.orig/src/nautilus-share.c  2007-09-22 18:21:07.000000000 +0300
+++ nautilus-share-0.7.2/src/nautilus-share.c   2008-11-12 23:39:18.829679652 +0200
@@ -1128,7 +1128,7 @@
   item = nautilus_menu_item_new ("NautilusShare::share",
                 _("Sharing Options"),
                 _("Share this Folder"),
-                "stock_shared-by-me");
+                "folder-remote");
   g_signal_connect (item, "activate",
            G_CALLBACK (share_this_folder_callback),
            fileinfo);


nautilus-share-moveto-extentions2.patch:

--- NEW FILE nautilus-share-moveto-extentions2.patch ---
diff -Naur nautilus-share-0.7.2.orig/src/Makefile.am nautilus-share-0.7.2/src/Makefile.am
--- nautilus-share-0.7.2.orig/src/Makefile.am   2007-09-22 18:19:36.000000000 +0300
+++ nautilus-share-0.7.2/src/Makefile.am    2008-11-12 23:22:28.722554317 +0200
@@ -11,7 +11,7 @@
    $(GLIB_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-share.la
 
diff -Naur nautilus-share-0.7.2.orig/src/Makefile.in nautilus-share-0.7.2/src/Makefile.in
--- nautilus-share-0.7.2.orig/src/Makefile.in   2007-09-22 19:04:34.000000000 +0300
+++ nautilus-share-0.7.2/src/Makefile.in    2008-11-12 23:23:20.506679795 +0200
@@ -245,7 +245,7 @@
 
 
 # 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-share.la
 libnautilus_share_la_SOURCES = \
    nautilus-share.c        \



Index: nautilus-share.spec
===================================================================
RCS file: /cvs/pkgs/rpms/nautilus-share/F-10/nautilus-share.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- nautilus-share.spec	6 Feb 2008 15:36:50 -0000	1.2
+++ nautilus-share.spec	12 Nov 2008 23:37:04 -0000	1.3
@@ -1,6 +1,6 @@
 Name:			nautilus-share
 Version:		0.7.2
-Release:		12%{?dist}
+Release:		13%{?dist}
 Summary:		Easy sharing folder via Samba (CIFS protocol)
 Summary(pl):		Proste dzielenie folderów poprzez Sambę (protokół CIFS)
 Group:			Applications/File
@@ -9,6 +9,8 @@
 Source0:		http://gentoo.ovibes.net/%{name}/%{name}-%{version}.tar.gz
 Source1:		nautilus-share-setup-instructions
 Source2:		nautilus-share-smb.conf.example
+Patch1:			nautilus-share-fix-icon.patch
+Patch2:			nautilus-share-moveto-extentions2.patch
 BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:		libdaemon-devel
@@ -29,6 +31,8 @@
 
 %prep
 %setup -q
+%patch1 -p1
+%patch2 -p1
 cp %{SOURCE1} SETUP
 
 
@@ -40,7 +44,7 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL='install -p'
-rm $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-1.0/lib%{name}.la
+rm $RPM_BUILD_ROOT%{_libdir}/nautilus/extensions-2.0/lib%{name}.la
 mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/samba/
 cp %{SOURCE2} $RPM_BUILD_ROOT/%{_sysconfdir}/samba/
 %find_lang %{name}
@@ -53,12 +57,16 @@
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING README TODO SETUP
-%{_libdir}/nautilus/extensions-1.0/*
+%{_libdir}/nautilus/extensions-2.0/*
 %{_datadir}/nautilus-share/
 %{_sysconfdir}/samba/%{name}-smb.conf.example
 
 
 %changelog
+* Wed Nov 12 2008 Muayyad Saleh Alsadi <alsadi at ojuba.org> - 0.7.2-13
+- set icon to "folder-remote"
+- don't use extensions-1.0 directory (fixes #447072)
+
 * Wed Feb 06 2008 Jakub 'Livio' Rusinek <jakub.rusinek at gmail.com> - 0.7.2-12
 - SETUP doc file added, example smb.conf file added (RHBZ#431655)... Fixed