rpms/fotoxx/F-9 .cvsignore, 1.7, 1.8 fotoxx.spec, 1.7, 1.8 sources, 1.8, 1.9

[Nicoleau Fabien]

Author: eponyme

Update of /cvs/pkgs/rpms/fotoxx/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25069

Modified Files:
	.cvsignore fotoxx.spec sources 
Log Message:
Update to 5.5



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/fotoxx/F-9/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- .cvsignore	9 Oct 2008 18:18:46 -0000	1.7
+++ .cvsignore	4 Nov 2008 22:13:34 -0000	1.8
@@ -1 +1 @@
-fotoxx-5.4.tar.gz
+fotoxx-5.5.tar.gz


Index: fotoxx.spec
===================================================================
RCS file: /cvs/pkgs/rpms/fotoxx/F-9/fotoxx.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- fotoxx.spec	9 Oct 2008 18:18:46 -0000	1.7
+++ fotoxx.spec	4 Nov 2008 22:13:34 -0000	1.8
@@ -1,5 +1,5 @@
 Name:           fotoxx
-Version:        5.4
+Version:        5.5
 Release:        1%{?dist}
 Summary:        Photo editor 
 
@@ -13,6 +13,7 @@
 BuildRequires:  gtk2-devel
 BuildRequires:  desktop-file-utils
 Requires:       exiv2
+Requires:       printoxx
 
 %description
 Fotoxx is a free open source Linux program for editing image files
@@ -23,20 +24,19 @@
 %setup -q -n %{name}
 # To use "fedora" CFLAGS (exported)
 sed -i -e "s/CFLAGS =/CFLAGS +=/" Makefile
-# I prefer %%{doc} usage than this line
-sed -i -e "/cp  -R doc\/\*  \$(DESTDIR)\$(DOCDIR)/d" Makefile
 
 %build
 CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; 
-make %{?_smp_mflags} PREFIX=%{_prefix}
+make %{?_smp_mflags} PREFIX=%{_prefix} DOCDIR=%{_docdir}/%{name}-%{version}
 
 
 %install
 rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix}
+make install DESTDIR=$RPM_BUILD_ROOT PREFIX=%{_prefix} DOCDIR=%{_docdir}/%{name}-%{version}
 install -Dm 644 -p data/icons/%{name}.png  $RPM_BUILD_ROOT%{_datadir}/pixmaps/%{name}.png
 desktop-file-install --vendor="" \
   --mode 644 \
+  --remove-category="Application" \
   --dir $RPM_BUILD_ROOT%{_datadir}/applications/ \
   %{SOURCE1}
 
@@ -55,6 +55,8 @@
 %{_datadir}/pixmaps/%{name}.png
 
 %changelog
+* Tue Nov  4 2008 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 5.5-1
+- Rebuild for 5.5
 * Thu Oct  9 2008 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 5.4-1
 - Rebuild for 5.4
 * Thu Sep 18 2008 Nicoleau Fabien <nicoleau.fabien at gmail.com> - 5.3-1


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/fotoxx/F-9/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- sources	9 Oct 2008 18:18:46 -0000	1.8
+++ sources	4 Nov 2008 22:13:34 -0000	1.9
@@ -1 +1 @@
-03ba5f8ea4919673fd90d90e5162eb45  fotoxx-5.4.tar.gz
+0623f839b6f33bca377a3150396422cc  fotoxx-5.5.tar.gz