- updated to 3.4.1

- updated quazip-qt5 patch
- removed obsolete cmake patch

diff --git a/cmake.patch b/cmake.patch
deleted file mode 100644 (file)
index 90f5b18..0000000
--- a/cmake.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- nomacs-3.0.0/cmake/Unix.cmake~     2016-03-31 09:58:15.000000000 +0900
-+++ nomacs-3.0.0/cmake/Unix.cmake      2016-03-31 10:00:45.488122085 +0900
-@@ -43,7 +43,7 @@
- # search for opencv
- unset(OpenCV_FOUND CACHE)
- if(ENABLE_OPENCV)
--      find_package(OpenCV 2.1.0 REQUIRED core imgproc)
-+      find_package(OpenCV REQUIRED core imgproc)
-       if (NOT OpenCV_LIBRARIES) # OpenCV_FOUND can not be used since it is set in Ubuntu 12.04 (without finding opencv)
-               # Older OpenCV versions only supplied pkg-config files
-               if(PKG_CONFIG_FOUND)

diff --git a/nomacs.spec b/nomacs.spec
index 402d555e956fe264918cda6896d419865fd9f20f..ff0f0866aa433af888b8cb7ff9bf6ef4cb46a024 100644 (file)
--- a/nomacs.spec
+++ b/nomacs.spec
@@ -3,33 +3,42 @@
 Summary:       Lightweight image viewer
 Summary(pl.UTF-8):     Lekka przeglądarka obrazków
 Name:          nomacs
-Version:       3.0.0
+Version:       3.4.1
 Release:       1
 License:       GPL v3+
 Group:         X11/Applications
-Source0:       https://github.com/nomacs/nomacs/releases/download/%{version}/%{name}-%{version}-source.tar.bz2
-# Source0-md5: e1630a4371d0e0f8aba9358ab20d43e5
+Source0:       https://github.com/nomacs/nomacs/archive/%{version}/%{name}-%{version}-source.tar.gz
+# Source0-md5: 1daf7458717eb545b2da8534cff36d6e
 Source1:       %{name}.appdata.xml
-Patch0:                cmake.patch
-Patch1:                quazip-qt5.patch
+Patch0:                quazip-qt5.patch
 URL:           http://nomacs.org/
-BuildRequires: cmake >= 2.6
+BuildRequires: Qt5Concurrent-devel >= 5.2.1
+BuildRequires: Qt5Core-devel >= 5.2.1
+BuildRequires: Qt5Gui-devel >= 5.2.1
+BuildRequires: Qt5Network-devel >= 5.2.1
+BuildRequires: Qt5Svg-devel >= 5.2.1
+BuildRequires: cmake >= 2.8
 BuildRequires: desktop-file-utils
 BuildRequires: dos2unix
-BuildRequires: exiv2-devel >= 0.20
-BuildRequires: libraw-devel >= 0.12.0
+BuildRequires: exiv2-devel >= 0.25
+BuildRequires: libraw-devel >= 0.17
+BuildRequires: libstdc++-devel >= 6:4.3
 BuildRequires: libtiff-devel
 BuildRequires: libwebp-devel >= 0.3.1
-BuildRequires: opencv-devel >= 2.1.0
+BuildRequires: opencv-devel >= 2.4.6
 BuildRequires: pkgconfig
-BuildRequires: Qt5Core-devel >= 5
-BuildRequires: Qt5Gui-devel >= 5
-BuildRequires: Qt5Network-devel >= 5
-BuildRequires: Qt5Concurrent-devel
-BuildRequires: qt5-build >= 5
-BuildRequires: qt5-linguist >= 5
-BuildRequires: qt5-qmake >= 5
+BuildRequires: qt5-build >= 5.2.1
+BuildRequires: qt5-linguist >= 5.2.1
+BuildRequires: qt5-qmake >= 5.2.1
 BuildRequires: quazip-qt5-devel >= 0.7
+Requires:      Qt5Concurrent >= 5.2.1
+Requires:      Qt5Core >= 5.2.1
+Requires:      Qt5Gui >= 5.2.1
+Requires:      Qt5Network >= 5.2.1
+Requires:      Qt5Svg >= 5.2.1
+Requires:      exiv2 >= 0.25
+Requires:      libraw >= 0.17
+Requires:      opencv >= 2.4.6
 BuildRoot:     %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -52,24 +61,24 @@ np. projekty architektów w celu pokazania postępów.
 
 %prep
 %setup -q
+cd ImageLounge
 %patch0 -p1
-%patch1 -p1
 
 dos2unix Readme/*
 
-%{__rm} -r 3rdparty/libwebp
 %{__rm} -r 3rdparty/quazip-0.7
 
 %build
 install -d build
 cd build
-%cmake \
+%cmake ../ImageLounge \
        -DENABLE_PLUGINS=ON \
        -DENABLE_RAW=1 \
        -DUSE_SYSTEM_WEBP=ON \
-       -DUSE_SYSTEM_QUAZIP=ON \
-       ..
-# -DUSE_SYSTEM_LIBQPSD=ON
+       -DUSE_SYSTEM_QUAZIP=ON
+
+# TODO: -DUSE_SYSTEM_LIBQPSD=ON
+
 %{__make}
 
 %install
@@ -78,10 +87,15 @@ rm -rf $RPM_BUILD_ROOT
 %{__make} -C build install \
        DESTDIR=$RPM_BUILD_ROOT
 
+# unify
+%{__mv} $RPM_BUILD_ROOT%{_datadir}/%{name}/translations/nomacs_{zh,zh_CN}.qm
 # translation to German "Vorarlbergerisch" dialect - should be de_AT@Vorarlberg?
 # ("als" is wrong code - it's Tosk Albanian in iso-639-3)
 %{__rm} $RPM_BUILD_ROOT%{_datadir}/%{name}/translations/nomacs_als.qm
 
+# API not exported, so keep only library files + soname symlinks
+%{__rm} $RPM_BUILD_ROOT%{_libdir}/libnomacs*.so
+
 desktop-file-validate $RPM_BUILD_ROOT%{_desktopdir}/%{name}.desktop
 
 install -d $RPM_BUILD_ROOT%{_datadir}/appdata
@@ -102,12 +116,17 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc Readme/{COPYRIGHT,LICENSE.OPENCV,README}
-%attr(755,root,root) %{_bindir}/%{name}
-%attr(755,root,root) %{_libdir}/libnomacslib.so
-%{_mandir}/man1/%{name}.1*
+%doc ImageLounge/Readme/{COPYRIGHT,LICENSE.OPENCV,README}
+%attr(755,root,root) %{_bindir}/nomacs
+%attr(755,root,root) %{_libdir}/libnomacsCore.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libnomacsCore.so.3
+%attr(755,root,root) %{_libdir}/libnomacsGui.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libnomacsGui.so.3
+%attr(755,root,root) %{_libdir}/libnomacsLoader.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libnomacsLoader.so.3
+%{_mandir}/man1/nomacs.1*
 %dir %{_datadir}/%{name}
 %dir %{_datadir}/%{name}/translations
-%{_datadir}/appdata/%{name}.appdata.xml
-%{_desktopdir}/%{name}.desktop
-%{_pixmapsdir}/%{name}.png
+%{_datadir}/appdata/nomacs.appdata.xml
+%{_desktopdir}/nomacs.desktop
+%{_pixmapsdir}/nomacs.svg

diff --git a/quazip-qt5.patch b/quazip-qt5.patch
index d37538ae652be1cb94d7f53442cbb8eb12622189..d22b7bae912b2fe1e91c379030303b8356a29cbe 100644 (file)
--- a/quazip-qt5.patch
+++ b/quazip-qt5.patch
@@ -1,19 +1,19 @@
---- nomacs-3.0.0/cmake/FindQuaZIP.cmake~       2015-12-17 11:01:42.000000000 +0100
-+++ nomacs-3.0.0/cmake/FindQuaZIP.cmake        2016-04-16 18:23:10.391672184 +0200
+--- nomacs-3.4.1/cmake/FindQuaZIP.cmake.orig   2016-09-09 21:46:55.635020115 +0200
++++ nomacs-3.4.1/cmake/FindQuaZIP.cmake        2016-09-09 21:59:03.015011808 +0200
 @@ -6,9 +6,9 @@
  if(QUAZIP_INCLUDE_DIRECTORY AND QUAZIP_LIBRARIES)
-   set(QUAZIP_FOUND TRUE)
+       set(QUAZIP_FOUND TRUE)
  else()
--  find_path(QUAZIP_INCLUDE_DIRECTORY NAMES quazip/quazip.h)
-+  find_path(QUAZIP_INCLUDE_DIRECTORY NAMES quazip5/quazip.h)
- 
--  find_library(QUAZIP_LIBRARIES NAMES quazip)
-+  find_library(QUAZIP_LIBRARIES NAMES quazip5)
- 
-   include(FindPackageHandleStandardArgs)
-   find_package_handle_standard_args(QUAZIP DEFAULT_MSG QUAZIP_INCLUDE_DIRECTORY QUAZIP_LIBRARIES)
---- nomacs-3.0.0/src/DkImageLoader.cpp~        2015-12-17 11:01:42.000000000 +0100
-+++ nomacs-3.0.0/src/DkImageLoader.cpp 2016-04-16 18:26:05.820609479 +0200
+-      find_path(QUAZIP_INCLUDE_DIRECTORY NAMES quazip/quazip.h)
++      find_path(QUAZIP_INCLUDE_DIRECTORY NAMES quazip5/quazip.h)
+       
+-      find_library(QUAZIP_LIBRARIES NAMES quazip)
++      find_library(QUAZIP_LIBRARIES NAMES quazip5)
+       
+       include(FindPackageHandleStandardArgs)
+       find_package_handle_standard_args(QUAZIP DEFAULT_MSG QUAZIP_INCLUDE_DIRECTORY QUAZIP_LIBRARIES)
+--- nomacs-3.4.1/src/DkLoader/DkImageLoader.cpp~       2015-12-17 11:01:42.000000000 +0100
++++ nomacs-3.4.1/src/DkLoader/DkImageLoader.cpp        2016-04-16 18:26:05.820609479 +0200
 @@ -74,7 +74,7 @@
  
  // quazip
@@ -23,15 +23,8 @@
  #endif
  
  // opencv
-@@ -2025,4 +2025,4 @@
-       return mCurrentImage->fileName();
- }
- 
--}
-\ No newline at end of file
-+}
---- nomacs-3.0.0/src/DkBasicLoader.cpp~        2015-12-17 11:01:42.000000000 +0100
-+++ nomacs-3.0.0/src/DkBasicLoader.cpp 2016-04-16 18:26:23.390836011 +0200
+--- nomacs-3.4.1/src/DkLoader/DkBasicLoader.cpp~       2015-12-17 11:01:42.000000000 +0100
++++ nomacs-3.4.1/src/DkLoader/DkBasicLoader.cpp        2016-04-16 18:26:23.390836011 +0200
 @@ -51,7 +51,7 @@
  
  // quazip
@@ -41,8 +34,8 @@
  #endif
  
  #ifdef WITH_WEBP
---- nomacs-3.0.0/src/DkImageContainer.cpp~     2015-12-17 11:01:42.000000000 +0100
-+++ nomacs-3.0.0/src/DkImageContainer.cpp      2016-04-16 18:26:39.697712795 +0200
+--- nomacs-3.4.1/src/DkLoader/DkImageContainer.cpp~    2015-12-17 11:01:42.000000000 +0100
++++ nomacs-3.4.1/src/DkLoader/DkImageContainer.cpp     2016-04-16 18:26:39.697712795 +0200
 @@ -41,7 +41,7 @@
  \r
  // quazip\r
@@ -52,25 +45,14 @@
  #endif\r
  #pragma warning(pop)          // no warnings from includes - end\r
  \r
---- nomacs-3.0.0/src/DkDialog.cpp~     2015-12-17 11:01:42.000000000 +0100
-+++ nomacs-3.0.0/src/DkDialog.cpp      2016-04-16 18:26:57.017935843 +0200
+--- nomacs-3.4.1/src/DkGui/DkDialog.cpp.orig   2016-09-09 22:00:28.425010835 +0200
++++ nomacs-3.4.1/src/DkGui/DkDialog.cpp        2016-09-09 22:01:33.561676757 +0200
 @@ -92,7 +92,7 @@
- \r
- // quazip\r
- #ifdef WITH_QUAZIP\r
--#include <quazip/JlCompress.h>\r
-+#include <quazip5/JlCompress.h>\r
- #endif\r
- \r
- #pragma warning(pop)          // no warnings from includes - end\r
---- nomacs-3.0.0/cmake/UnixBuildTarget.cmake~  2015-12-17 11:01:42.000000000 +0100
-+++ nomacs-3.0.0/cmake/UnixBuildTarget.cmake   2016-04-16 18:44:12.575613004 +0200
-@@ -93,7 +93,7 @@
-                 
-   add_library(${DLL_NAME} SHARED ${NOMACS_SOURCES} ${NOMACS_UI} ${NOMACS_HEADERS} ${NOMACS_RC} ${LIBQPSD_SOURCES} ${LIBQPSD_HEADERS} ${WEBP_SOURCE}  ${QUAZIP_SOURCES} ${NOMACS_RESOURCES} ${NOMACS_RCC})
-   target_include_directories(${DLL_NAME} PRIVATE  ${OpenCV_INCLUDE_DIRS})
--  target_link_libraries(${DLL_NAME} ${QT_LIBRARIES} ${EXIV2_LIBRARIES} ${LIBRAW_LIBRARIES} ${OpenCV_LIBRARIES} ${VERSION_LIB} ${TIFF_LIBRARIES} ${HUPNP_LIBS} ${HUPNPAV_LIBS} ${WEBP_LIBRARIES} ${WEBP_STATIC_LIBRARIES})
-+  target_link_libraries(${DLL_NAME} ${QT_LIBRARIES} ${EXIV2_LIBRARIES} ${LIBRAW_LIBRARIES} ${OpenCV_LIBRARIES} ${VERSION_LIB} ${TIFF_LIBRARIES} ${HUPNP_LIBS} ${HUPNPAV_LIBS} ${QUAZIP_LIBRARIES} ${WEBP_LIBRARIES} ${WEBP_STATIC_LIBRARIES})
-   add_dependencies(${BINARY_NAME} ${DLL_NAME})
-   set_target_properties(${DLL_NAME} PROPERTIES PREFIX "")
+ #include <QPrinterInfo>
+ // quazip
+ #ifdef WITH_QUAZIP
+-#include <quazip/JlCompress.h>
++#include <quazip5/JlCompress.h>
+ #endif
  
+ #pragma warning(pop)          // no warnings from includes - end