rpms/gnome-user-share/devel .cvsignore, 1.14, 1.15 gnome-user-share.spec, 1.43, 1.44 sources, 1.14, 1.15

[Bastien Nocera]

Author: hadess

Update of /cvs/pkgs/rpms/gnome-user-share/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv4701

Modified Files:
	.cvsignore gnome-user-share.spec sources 
Log Message:
* Tue Jan 27 2009 - Bastien Nocera <bnocera at redhat.com> - 2.25.5-1
- Update to 2.25.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-user-share/devel/.cvsignore,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- .cvsignore	17 Dec 2008 10:01:57 -0000	1.14
+++ .cvsignore	27 Jan 2009 16:00:17 -0000	1.15
@@ -1 +1 @@
-gnome-user-share-0.41.tar.gz
+gnome-user-share-2.25.5.tar.bz2


Index: gnome-user-share.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-user-share/devel/gnome-user-share.spec,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- gnome-user-share.spec	17 Dec 2008 10:01:57 -0000	1.43
+++ gnome-user-share.spec	27 Jan 2009 16:00:17 -0000	1.44
@@ -1,25 +1,29 @@
 Summary: Gnome user file sharing
 Name: gnome-user-share
-Version: 0.41
+Version: 2.25.5
 Release: 1%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://www.gnome.org
-Source0: http://download.gnome.org/sources/gnome-user-share/0.40/%{name}-%{version}.tar.gz
+Source0: http://download.gnome.org/sources/gnome-user-share/2.25/%{name}-%{version}.tar.bz2
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) 
 Requires: httpd >= 2.2.0
 Requires: obex-data-server >= 0.3
-BuildRequires: GConf2-devel avahi-glib-devel >= 0.6 pkgconfig
+Requires: mod_dnssd
+BuildRequires: GConf2-devel pkgconfig
 BuildRequires: gtk2-devel >= 2.4.0
 BuildRequires: httpd >= 2.2.0
 BuildRequires: desktop-file-utils
+BuildRequires: gnome-doc-utils
 BuildRequires: libselinux-devel
 BuildRequires: dbus-glib-devel
 BuildRequires: libnotify-devel
 BuildRequires: gettext
 BuildRequires: perl(XML::Parser) intltool
 Requires(post): GConf2
+Requires(post): scrollkeeper
+Requires(postun): scrollkeeper
 Requires(pre): GConf2
 Requires(preun): GConf2
 
@@ -57,12 +61,29 @@
   --add-category X-Red-Hat-Base                                         \
   $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop
 
-%find_lang gnome-user-share
+%find_lang gnome-user-share --with-gnome
+
+# save space by linking identical images in translated docs
+helpdir=$RPM_BUILD_ROOT%{_datadir}/gnome/help/%{name}
+for f in $helpdir/C/figures/*.png; do
+  b="$(basename $f)"
+  for d in $helpdir/*; do
+    if [ -d "$d" -a "$d" != "$helpdir/C" ]; then
+      g="$d/figures/$b"
+      if [ -f "$g" ]; then
+        if cmp -s $f $g; then
+          rm "$g"; ln -s "../../C/figures/$b" "$g"
+        fi
+      fi
+    fi
+  done
+done
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 %post
+scrollkeeper-update -q
 export GCONF_CONFIG_SOURCE=`gconftool-2 --get-default-source`
 gconftool-2 --makefile-install-rule %{_sysconfdir}/gconf/schemas/desktop_gnome_file_sharing.schemas > /dev/null || :
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
@@ -82,6 +103,7 @@
 fi
 
 %postun
+scrollkeeper-update -q
 if [ -x /usr/bin/gtk-update-icon-cache ]; then
   /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
 fi
@@ -98,6 +120,9 @@
 %{_datadir}/icons/hicolor/*/apps/gnome-obex-server.png
 
 %changelog
+* Tue Jan 27 2009 - Bastien Nocera <bnocera at redhat.com> - 2.25.5-1
+- Update to 2.25.5
+
 * Wed Dec 17 2008 - Bastien Nocera <bnocera at redhat.com> - 0.41-1
 - Update to 0.41
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gnome-user-share/devel/sources,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- sources	17 Dec 2008 10:01:57 -0000	1.14
+++ sources	27 Jan 2009 16:00:17 -0000	1.15
@@ -1 +1 @@
-af883363ff0dfeaa8733d4a048da9975  gnome-user-share-0.41.tar.gz
+f6f82430727b9fda6954d3de0d43b843  gnome-user-share-2.25.5.tar.bz2