[qfaxreader] New upstream release; requires cmake 2.8

Tue Jun 10 22:01:23 UTC 2014

commit 7856fa2532433b34e0de4fa6d3a39b74abdca20a
Author: Manuel Wolfshant <wolfy at fedoraproject.org>
Date:   Wed Jun 11 01:01:32 2014 +0300

    New upstream release; requires cmake 2.8
    
    - Single spec for all RHEL and Fedora supported releases

 .gitignore                             |    1 +
 libtiff3.patch                         |    9 ++++
 qfaxreader-0.3.1-format-security.patch |   12 -----
 qfaxreader-gcc4.3.0-configure.patch    |   11 -----
 qfaxreader-parallel_build.patch        |   42 ------------------
 qfaxreader.spec                        |   74 ++++++++++++++++++++------------
 sources                                |    2 +-
 7 files changed, 58 insertions(+), 93 deletions(-)
---

diff --git a/.gitignore b/.gitignore
index 3a329d5..4bc232c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 qfaxreader-0.3.1.tar.bz2
+/qfaxreader-0.3.2.tar.bz2
diff --git a/libtiff3.patch b/libtiff3.patch
new file mode 100644
index 0000000..942419d
--- /dev/null
+++ b/libtiff3.patch
@@ -0,0 +1,9 @@
+diff -up qfaxreader-0.3.2/ConfigureChecks.cmake.orig qfaxreader-0.3.2/ConfigureChecks.cmake
+--- qfaxreader-0.3.2/ConfigureChecks.cmake.orig	2014-06-10 23:45:01.696130950 +0300
++++ qfaxreader-0.3.2/ConfigureChecks.cmake	2014-06-10 23:45:14.104130949 +0300
+@@ -23,4 +23,4 @@ elseif( WITH_BDB )
+   set( BDB 1 )
+ endif( )
+ 
+-kde_search_module( TIFF libtiff-4 )
++kde_search_library( TIFF_LIBRARIES "tiff.h" "tiff" )
diff --git a/qfaxreader.spec b/qfaxreader.spec
index 247a452..6e1481e 100644
--- a/qfaxreader.spec
+++ b/qfaxreader.spec
@@ -1,19 +1,26 @@
 Name:         qfaxreader
 License:      GPLv2+
 Group:        Applications/Communications
-Version:      0.3.1
-Release:      21%{dist}
+Version:      0.3.2
+Release:      1%{dist}
 Summary:      A multipage monochrome/color TIFF/FAX viewer
 Source:       http://downloads.sourceforge.net/sourceforge/%{name}/%{name}-%{version}.tar.bz2
-Patch0:       qfaxreader-parallel_build.patch
-Patch1:       qfaxreader-gcc4.3.0-configure.patch
-Patch2:       qfaxreader-0.3.1-format-security.patch
+Patch0:       libtiff3.patch
 BuildRoot:    %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 URL:          http://qfaxreader.sourceforge.net/
-BuildRequires:  qt3-devel , libtiff-devel, gdbm-devel
+BuildRequires:  libtiff-devel, gdbm-devel
+%if  ( "0%{?dist}" >= "0.fc20" ) || ( "0%{?dist}" >= "0.el6" )
+BuildRequires:  qt3-devel 
+%else
+BuildRequires:  qt-devel
+%endif
 BuildRequires:  desktop-file-utils
-%if "0%{?dist}" >= "0.fc19"
-BuildRequires:  autoconf
+%if ( "0%{?dist}" >= "0.fc20" ) || ( "0%{?dist}" == "0.el7" )
+BuildRequires:  cmake
+%else
+%if "0%{?dist}" <= "0.el6"
+BuildRequires:  cmake28
+%endif
 %endif
 Requires:     hicolor-icon-theme
 
@@ -36,32 +43,37 @@ Features:
 * CID support
 
 %prep
-%setup -q 
-%patch0 -p1 -b .parallel_make
-%patch1 -p1 -b .gcc430
-%patch2 -p1 -b .format
+%setup -q
+#RHEL <=6 has libtiff v3 which works just fine
+%patch0 -p1 -b .libtiff
+
 %build
-%if "0%{?dist}" >= "0.fc19"
-autoconf
-%endif
+mkdir build
+cd build
 
-%if "0%{?dist}" >= "0.fc20"
-#CFLAGS="$RPM_OPT_FLAGS -Werror=format-security" CXXFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{_prefix} \
-CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{_prefix} \
-       --with-docdir=%{_defaultdocdir}/%{name} --datadir=%{_datadir}   \
-       --mandir=%{_mandir} --libdir=%{_libdir}
+%if ( "0%{?dist}" >= "0.fc20" ) || ( "0%{?dist}" == "0.el7" )
+%cmake .. -DQT_PREFIX_DIR=%{_libdir}/qt-3.3 -DQT_LIBRARY_DIR=%{_libdir}/qt-3.3/lib -DWITH_GDBM=ON
 %else
-#CFLAGS="$RPM_OPT_FLAGS -Werror=format-security" CXXFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{_prefix} \
-CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{_prefix} \
-       --with-docdir=%{_defaultdocdir}/%{name}-%{version} --datadir=%{_datadir}   \
-       --mandir=%{_mandir} --libdir=%{_libdir}
+%if "0%{?dist}" <= "0.el6"
+%cmake28 .. -DQT_PREFIX_DIR=%{_libdir}/qt-3.3 -DQT_LIBRARY_DIR=%{_libdir}/qt-3.3/lib -DWITH_GDBM=ON
 %endif
+%endif
+#CFLAGS="$RPM_OPT_FLAGS -Werror=format-security" CXXFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{_prefix} \
+#CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{_prefix} \
+#       --with-docdir=%{_defaultdocdir}/%{name} --datadir=%{_datadir}   \
+#       --mandir=%{_mandir} --libdir=%{_libdir}
+#%else
+#CFLAGS="$RPM_OPT_FLAGS -Werror=format-security" CXXFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{_prefix} \
+#CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{_prefix} \
+#       --with-docdir=%{_defaultdocdir}/%{name}-%{version} --datadir=%{_datadir}   \
+#       --mandir=%{_mandir} --libdir=%{_libdir}
+#%endif
 make %{?_smp_mflags}
 
 
 %install
 rm -rf %{buildroot}
-make install DESTDIR=%{buildroot}
+make install DESTDIR=%{buildroot} -C build
 
 #mkdir -p %{buildroot}/%{_datadir}/applications
 mkdir -p %{buildroot}/%{_datadir}/icons/hicolor/16x16/apps
@@ -75,6 +87,10 @@ install -p -m 644 kde/icon-32.png %{buildroot}/%{_datadir}/icons/hicolor/32x32/a
 desktop-file-install                                    \
 %if 0%{?fedora} && 0%{?fedora} < 19
         --vendor "fedora"                               \
+%else
+%if 0%{?rhel} && 0%{?rhel} == 5
+        --vendor "fedora"                               \
+%endif
 %endif
         --remove-category Application                   \
         --dir %{buildroot}/%{_datadir}/applications     \
@@ -105,14 +121,18 @@ fi
 
 
 %changelog
+* Mon Jun 09 2014 Manuel "lonely wolf" Wolfshant <wolfy at fedoraproject.org> - 0.3.2-1
+- New upstream release; requires cmake 2.8
+- Single spec for all RHEL and Fedora supported releases
+
 * Sun Jun 08 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.1-21
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
 
 * Tue Dec 03 2013 Manuel "lonely wolf" Wolfshant <wolfy at fedoraproject.org> - 0.3.1-20
-- build with  "-Werror=format-security" flag
+- Build with  "-Werror=format-security" flag
 
 * Mon Aug 05 2013 Manuel "lonely wolf" Wolfshant <wolfy at fedoraproject.org> - 0.3.1-19
-- fix unversioned docdir
+- Fix unversioned docdir
 
 * Sun Aug 04 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.3.1-18
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
diff --git a/sources b/sources
index e6cb098..ae2f728 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-165774433c44f721e82552c866e7be87  qfaxreader-0.3.1.tar.bz2
+f13ea5be173b45365fea1e9e54c222a2  qfaxreader-0.3.2.tar.bz2
