[rpms/gnome-user-share] wip/oholy/f45-update: fix build

[rpms/gnome-user-share] wip/oholy/f45-update: fix build

[Matthias Clasen]

A new commit has been pushed.

Repo   : rpms/gnome-user-share
Branch : wip/oholy/f45-update
Commit : 4850cd60ccfd97e148d558e5bf73735d7bd0e98d
Author : Matthias Clasen <mclasen@fedoraproject.org>
Date   : 2010-02-14T06:11:27+00:00
Stats  : +13/-10 in 1 file(s)
URL    : https://src.fedoraproject.org/rpms/gnome-user-share/c/4850cd60ccfd97e148d558e5bf73735d7bd0e98d?branch=wip/oholy/f45-update

Log:
fix build

---
diff --git a/gnome-user-share.spec b/gnome-user-share.spec
index f7f85c6..11e51e7 100644
--- a/gnome-user-share.spec
+++ b/gnome-user-share.spec
@@ -1,7 +1,7 @@
 Summary: Gnome user file sharing
 Name: gnome-user-share
 Version: 2.28.1
-Release: 3%{?dist}
+Release: 4%{?dist}
 License: GPLv2+
 Group: System Environment/Libraries
 URL: http://www.gnome.org
@@ -35,9 +35,8 @@ BuildRequires: libnotify-devel
 BuildRequires: nautilus-devel
 BuildRequires: gettext
 BuildRequires: perl(XML::Parser) intltool
+BuildRequires: scrollkeeper
 Requires(post): GConf2
-Requires(post): scrollkeeper
-Requires(postun): scrollkeeper
 Requires(pre): GConf2
 Requires(preun): GConf2
 
@@ -105,12 +104,9 @@ done
 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
-  /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
-fi
+touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :
 
 %pre
 if [ "$1" -gt 1 ]; then
@@ -125,11 +121,14 @@ if [ "$1" -eq 0 ]; then
 fi
 
 %postun
-scrollkeeper-update -q
-if [ -x /usr/bin/gtk-update-icon-cache ]; then
-  /usr/bin/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor
+if [ $1 -eq 0 ]; then
+  touch --no-create %{_datadir}/icons/hicolor >&/dev/null || :
+  gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor >&/dev/null || :
 fi
 
+%posttrans
+gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor >&/dev/null || :
+
 %files -f gnome-user-share.lang
 %defattr(-,root,root,-)
 %doc README COPYING NEWS AUTHORS
@@ -143,6 +142,10 @@ fi
 %{_libdir}/nautilus/extensions-2.0/*.so
 
 %changelog
+* Sun Feb 14 2010 Matthias Clasen <mclasen@redhat.com> 2.28.1-4
+- Modernize scripts
+- Fix build
+
 * Tue Nov 10 2009 Bastien Nocera <bnocera@redhat.com> 2.28.1-3
 - Fix crasher on exit when ObexFTP isn't started (#533977)
 

[rpms/gnome-user-share] wip/oholy/f45-update: Fix build

[Bastien Nocera]

A new commit has been pushed.

Repo   : rpms/gnome-user-share
Branch : wip/oholy/f45-update
Commit : 3b7523fcbdb6d1d51f491d3642f593b024968d5d
Author : Bastien Nocera <hadess@fedoraproject.org>
Date   : 2008-03-31T11:33:29+00:00
Stats  : +1/-2 in 1 file(s)
URL    : https://src.fedoraproject.org/rpms/gnome-user-share/c/3b7523fcbdb6d1d51f491d3642f593b024968d5d?branch=wip/oholy/f45-update

Log:
Fix build

---
diff --git a/gnome-user-share.spec b/gnome-user-share.spec
index c19ecb8..680e99a 100644
--- a/gnome-user-share.spec
+++ b/gnome-user-share.spec
@@ -13,7 +13,6 @@ Requires: obex-data-server >= 0.3
 BuildRequires: GConf2-devel avahi-glib-devel >= 0.6 pkgconfig
 BuildRequires: gtk2-devel >= 2.4.0
 BuildRequires: httpd >= 2.2.0
-BuildRequires: libglade2-devel >= 2.0.0
 BuildRequires: desktop-file-utils
 BuildRequires: libselinux-devel
 BuildRequires: dbus-glib-devel
@@ -93,7 +92,7 @@ fi
 %{_libexecdir}/*
 %{_datadir}/gnome-user-share
 %{_datadir}/applications/*
-%{_datadir}/gnome/autostart/gnome-user-share.desktop
+%{_sysconfdir}/xdg/autostart/gnome-user-share.desktop
 %{_sysconfdir}/gconf/schemas/*
 %{_datadir}/icons/hicolor/*/apps/gnome-obex-server.png