rpms/rawstudio/FC-5 rawstudio-0.4.1-destdir.patch, NONE, 1.1 rawstudio.spec, 1.2, 1.3

[Gianluca Sforna (giallu)]

Author: giallu

Update of /cvs/extras/rpms/rawstudio/FC-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29424

Modified Files:
	rawstudio.spec 
Added Files:
	rawstudio-0.4.1-destdir.patch 
Log Message:
updates for new upstream release


rawstudio-0.4.1-destdir.patch:

--- NEW FILE rawstudio-0.4.1-destdir.patch ---
Index: rawstudio-0.4.1/Makefile.am
===================================================================
--- rawstudio-0.4.1.orig/Makefile.am
+++ rawstudio-0.4.1/Makefile.am
@@ -14,16 +14,16 @@ ChangeLog:
 install-data-local:
 	@$(NORMAL_INSTALL)
 	if test -d $(srcdir)/pixmaps; then \
-	  $(mkinstalldirs) $(prefix)/share/pixmaps; \
+	  $(mkinstalldirs) $(DESTDIR)$(prefix)/share/pixmaps; \
 	  for pixmap in $(srcdir)/pixmaps/*; do \
 	    if test -f $$pixmap; then \
-	      $(INSTALL_DATA) $$pixmap $(prefix)/share/pixmaps; \
+	      $(INSTALL_DATA) $$pixmap $(DESTDIR)$(prefix)/share/pixmaps; \
 	    fi \
 	  done \
 	fi
-	$(mkinstalldirs) $(prefix)/share/applications; \
+	$(mkinstalldirs) $(DESTDIR)$(prefix)/share/applications; \
 	if test -f rawstudio.desktop; then \
-	  $(INSTALL_DATA) rawstudio.desktop $(prefix)/share/applications; \
+	  $(INSTALL_DATA) rawstudio.desktop $(DESTDIR)$(prefix)/share/applications; \
 	fi
 
 dist-hook:


Index: rawstudio.spec
===================================================================
RCS file: /cvs/extras/rpms/rawstudio/FC-5/rawstudio.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- rawstudio.spec	27 Sep 2006 22:18:46 -0000	1.2
+++ rawstudio.spec	29 Sep 2006 08:46:53 -0000	1.3
@@ -9,14 +9,21 @@
 Source0:        http://www.rawstudio.org/files/release/%{name}-%{version}.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-BuildRequires:  gtk2-devel, libxml2-devel, GConf2-devel, lcms-devel
+BuildRequires:  gtk2-devel, libxml2-devel, GConf2-devel
+BuildRequires:  lcms-devel, libjpeg-devel
+BuildRequires:  desktop-file-utils
+BuildRequires:  automake
 Requires:       dcraw
 
+Patch0:         rawstudio-0.4.1-destdir.patch
+
 %description
 Rawstudio is an open source raw-image converter written in GTK+.
 
 %prep
 %setup -q
+%patch0 -p1 -b .patch0
+automake
 
 
 %build
@@ -28,19 +35,36 @@
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
+desktop-file-install --vendor fedora                            \
+        --dir ${RPM_BUILD_ROOT}%{_datadir}/applications         \
+        --add-category X-Fedora                                 \
+        --delete-original                                       \
+        ${RPM_BUILD_ROOT}%{_datadir}/applications/rawstudio.desktop
+
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post
+update-desktop-database &> /dev/null ||:
+
+%postun
+update-desktop-database &> /dev/null ||:
+
 
 %files
 %defattr(-,root,root,-)
 %doc README NEWS COPYING AUTHORS
 %{_bindir}/rawstudio
+%{_datadir}/applications/fedora-rawstudio.desktop
+%{_datadir}/pixmaps/rawstudio.png
+
 
 %changelog
 * Wed Sep 27 2006 Gianluca Sforna <giallu gmail com> 0.4.1-1
 - new upstream version
+- Add DESTDIR patch (and BR: automake)
+- New .desktop file and icon
 
 * Fri Jul 28 2006 Gianluca Sforna <giallu gmail com> 0.3-1
 - Initial package. Adapted from fedora-rpmdevtools template.