From d6db0582882d46e5848baa4821849868a892ad84 Mon Sep 17 00:00:00 2001
From: Pavel Alexeev <hubbitus@fedoraproject.org>
Date: Aug 09 2009 10:34:24 +0000
Subject: - Update to version 8.0

- Delete old patches.
- Add new man file.

---

diff --git a/.cvsignore b/.cvsignore
index 8ec7f61..fadf0fb 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1,2 +1,2 @@
-fotoxx-6.0.tar.gz
-fotoxx-5.8.constchar.patch
+fotoxx-8.0.tar.gz
+fotoxx-8.0-mandir.patch
diff --git a/fotoxx-dynamically-link.patch b/fotoxx-dynamically-link.patch
deleted file mode 100644
index 5256d71..0000000
--- a/fotoxx-dynamically-link.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- fotoxx/Makefile.BAD	2009-02-25 10:46:07.000000000 -0600
-+++ fotoxx/Makefile	2009-02-25 10:46:24.000000000 -0600
-@@ -20,7 +20,7 @@
- 
- 
- $(PROGRAM): $(PROGRAM).o zfuncs.o
--	@g++ $(LFLAGS) -o $(PROGRAM) $(PROGRAM).o zfuncs.o libfreeimage.a
-+	@g++ $(LFLAGS) -o $(PROGRAM) $(PROGRAM).o zfuncs.o -l freeimage
- 
- $(PROGRAM).o: $(SOURCE) zfuncs.h
- 	@g++ $(CFLAGS) -o $(PROGRAM).o $(SOURCE)		\
diff --git a/fotoxx.spec b/fotoxx.spec
index 3298cac..ca44303 100644
--- a/fotoxx.spec
+++ b/fotoxx.spec
@@ -1,6 +1,6 @@
 Name:		fotoxx
-Version:		6.0
-Release:		4%{?dist}
+Version:		8.0
+Release:		5%{?dist}
 Summary:		Photo editor
 
 Group:		Applications/Multimedia
@@ -12,12 +12,16 @@ BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:	gtk2-devel
 BuildRequires:	desktop-file-utils
-BuildRequires:  freeimage-devel
+BuildRequires:	freeimage-devel
 Requires:		exiv2
 Requires:		printoxx
 
-Patch0:		fotoxx-5.8.constchar.patch
-Patch1:         fotoxx-dynamically-link.patch
+# Presents checked at build time
+BuildRequires:	perl-Image-ExifTool ufraw
+Requires:		perl-Image-ExifTool ufraw
+
+# No public bugtracker. Sent to author by mail 2009-08-09
+Patch0:		fotoxx-8.0-mandir.patch
 
 %description
 Fotoxx is a free open source Linux program for editing image files
@@ -25,37 +29,33 @@ from a digital camera. The goal of fotoxx is to meet most image editing
 needs while remaining easy to use.
 
 %prep
-%setup -q -n %{name}
-rm libfreeimage.a
-%patch0 -p1 -b .constchar
-%patch1 -p1 -b .dynamic
+%setup -q
+%patch0 -p0 -b .mandir
 
 # To use "fedora" CFLAGS (exported)
 sed -i -e "s/CFLAGS =/CFLAGS +=/" Makefile
 
 %build
 CFLAGS="${CFLAGS:-%optflags}" ; export CFLAGS ; 
-make %{?_smp_mflags} PREFIX=%{_prefix} DOCDIR=%{_docdir}/%{name}-%{version}
-
+make %{?_smp_mflags} PREFIX=%{_prefix}
 
 %install
-rm -rf $RPM_BUILD_ROOT
-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
+rm -rf %{buildroot}
+make install DESTDIR=%{buildroot} PREFIX=%{_prefix} DOCDIR=%{_docdir}/%{name}-%{version}
+install -Dm 644 -p data/icons/%{name}.png %{buildroot}%{_datadir}/pixmaps/%{name}.png
 desktop-file-install --vendor="" \
-  --mode 644 \
-  --remove-category="Application" \
-  --dir $RPM_BUILD_ROOT%{_datadir}/applications/ \
-  %{SOURCE1}
-
+	--mode 644 \
+	--remove-category="Application" \
+	--dir %{buildroot}%{_datadir}/applications/ \
+	%{SOURCE1}
 
 %clean
-rm -rf $RPM_BUILD_ROOT
-
+rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
 %doc doc/*
+%doc %{_mandir}/man1/%{name}.1*
 %dir %{_datadir}/%{name}
 %{_bindir}/%{name}
 %{_datadir}/%{name}/icons/
@@ -64,6 +64,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/pixmaps/%{name}.png
 
 %changelog
+* Sun Aug 9 2009 Pavel Alexeev <Pahan@Hubbitus.info> - 8.0-5
+- Update to version 8.0
+- Delete old patches.
+- Remove rm libfreeimage.a, name of dir in %%setup.
+- Replace all $RPM_BUILD_ROOT by %%{buildroot}
+- Add Patch0: fotoxx-8.0-mandir.patch
+- Add new file %%doc %%{_mandir}/man1/%%{name}.1*
+
 * Fri Jul 24 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 6.0-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
diff --git a/sources b/sources
index 09c71d7..942fc69 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-e86c8d39bc2e1b30ddac32c58d7d3c3a  fotoxx-6.0.tar.gz
-7e891f89b87ee5a3e8db60a8860f4221  fotoxx-5.8.constchar.patch
+66ad6298923a1593c8035ccdd122dfec  fotoxx-8.0.tar.gz
+43abca5f7838f56acd1979afc59d0b69  fotoxx-8.0-mandir.patch