rpms/xpad/F-10 xpad.spec,1.4,1.5

[Stefan Posdzich]

Author: cheekyboinc

Update of /cvs/pkgs/rpms/xpad/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv19987

Modified Files:
	xpad.spec 
Log Message:
- Add autostart
- Add new icon cache scriptlets
- Fix macros



Index: xpad.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xpad/F-10/xpad.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- xpad.spec	30 May 2009 16:49:52 -0000	1.4
+++ xpad.spec	13 Jun 2009 09:38:37 -0000	1.5
@@ -1,6 +1,6 @@
 Name:		xpad
 Version:	4.0
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Sticky notepad for GTK+2
 
 Group:		User Interface/Desktops
@@ -9,7 +9,6 @@ URL:		http://xpad.sourceforge.net
 Source0:	http://downloads.sourceforge.net/%{name}/%{name}-%{version}.tar.bz2
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Requires:	hicolor-icon-theme
 BuildRequires:	gtk2-devel libSM-devel gettext desktop-file-utils intltool
 
 %description
@@ -27,40 +26,49 @@ the GTK+ 2.0 libraries.
 %build
 %configure
 
-make %{?_smp_mflags} CFLAGS="${RPM_OPT_FLAGS}"
+make %{?_smp_mflags} CFLAGS="%{optflags}"
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot}
 
 # desktop file stuff
 desktop-file-install --vendor="fedora" \
 	--delete-original \
-	--dir=$RPM_BUILD_ROOT%{_datadir}/applications \
+	--dir=%{buildroot}/%{_datadir}/applications \
 	%{buildroot}/%{_datadir}/applications/%{name}.desktop
 
+# additional autostart file
+mkdir -p %{buildroot}%{_sysconfdir}/xdg/autostart
+desktop-file-install \
+	--add-category=GTK \
+	--dir=%{buildroot}/%{_sysconfdir}/xdg/autostart \
+	%{name}.desktop
+
+
 %find_lang %{name}
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 
 %post
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
-%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-fi
+touch --no-create %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %postun
-touch --no-create %{_datadir}/icons/hicolor
-if [ -x %{_bindir}/gtk-update-icon-cache ] ; then
-%{_bindir}/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 %{_datadir}/icons/hicolor &>/dev/null || :
 fi
 
 
+%posttrans
+gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
+
+
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS ChangeLog COPYING README
@@ -68,9 +76,15 @@ fi
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
 %{_mandir}/man1/%{name}.1*
+%{_sysconfdir}/xdg/autostart/%{name}.desktop
 
 
 %changelog
+* Sat Jun 13 2009 Stefan Posdzich <cheekyboinc at foresightlinux.org> - 4.0-3
+- Add autostart
+- Add new icon cache scriptlets
+- Fix macros
+
 * Sat May 30 2009 Stefan Posdzich <cheekyboinc at foresightlinux.org> - 4.0-2
 - Add BR intltool