rpms/xpad/devel xpad.spec,1.8,1.9

[Christoph Wickert]

Author: cwickert

Update of /cvs/pkgs/rpms/xpad/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3759/d

Modified Files:
	xpad.spec 
Log Message:
* Sat Oct 24 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.0-5
- Remove autostart again. Doesn't work properly and is annoying on Live CDs
- Spec file clean-ups



Index: xpad.spec
===================================================================
RCS file: /cvs/pkgs/rpms/xpad/devel/xpad.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- xpad.spec	27 Jul 2009 08:41:15 -0000	1.8
+++ xpad.spec	24 Oct 2009 21:40:28 -0000	1.9
@@ -1,6 +1,6 @@
 Name:		xpad
 Version:	4.0
-Release:	4%{?dist}
+Release:	5%{?dist}
 Summary:	Sticky notepad for GTK+2
 
 Group:		User Interface/Desktops
@@ -12,12 +12,10 @@ BuildRoot:	%{_tmppath}/%{name}-%{version
 BuildRequires:	gtk2-devel libSM-devel gettext desktop-file-utils intltool
 
 %description
-Xpad is a sticky note application written using GTK+ 2.0 
-that strives to be simple, fault-tolerant, and customizable. 
-Xpad consists of independent pad windows; each is basically 
-a text box in which notes can be written. Despite being 
-called xpad, all that is needed to run or compile it is 
-the GTK+ 2.0 libraries.
+Xpad is a sticky note application that strives to be simple, fault-tolerant, 
+and customizable. It consists of independent pad windows; each is basically a 
+text box in which notes can be written. Despite being called xpad, all that is
+needed to run or compile it is the GTK+ 2.0 libraries.
 
 %prep
 %setup -q
@@ -26,12 +24,12 @@ the GTK+ 2.0 libraries.
 %build
 %configure
 
-make %{?_smp_mflags} CFLAGS="%{optflags}"
+make %{?_smp_mflags}
 
 
 %install
 rm -rf %{buildroot}
-make install DESTDIR=%{buildroot}
+make install DESTDIR=%{buildroot} INSTALL='install -p'
 
 # desktop file stuff
 desktop-file-install --vendor="fedora" \
@@ -39,14 +37,6 @@ desktop-file-install --vendor="fedora" \
 	--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}
 
 
@@ -76,9 +66,12 @@ gtk-update-icon-cache %{_datadir}/icons/
 %{_datadir}/applications/fedora-%{name}.desktop
 %{_datadir}/icons/hicolor/scalable/apps/%{name}.svg
 %{_mandir}/man1/%{name}.1*
-%{_sysconfdir}/xdg/autostart/%{name}.desktop
 
 %changelog
+* Sat Oct 24 2009 Christoph Wickert <cwickert at fedoraproject.org> - 4.0-5
+- Remove autostart again. Doesn't work properly and is annoying on Live CDs
+- Spec file clean-ups
+
 * Mon Jul 27 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild