diff --git a/.gitignore b/.gitignore index 68c9a94..46afdea 100644 --- a/.gitignore +++ b/.gitignore @@ -6,3 +6,4 @@ viewnior-1.0.tar.gz /viewnior-1.5.tar.gz /viewnior-1.6.tar.gz /viewnior-1.7.tar.gz +/viewnior-1.8.tar.gz diff --git a/0001-Fix-build-with-exiv2-0.28.0-raise-minimum-to-0.27.0.patch b/0001-Fix-build-with-exiv2-0.28.0-raise-minimum-to-0.27.0.patch new file mode 100644 index 0000000..c8ed300 --- /dev/null +++ b/0001-Fix-build-with-exiv2-0.28.0-raise-minimum-to-0.27.0.patch @@ -0,0 +1,100 @@ +From 8767bc47c2cc9591745ee2b3214fff38eaab114f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Robert-Andr=C3=A9=20Mauchin?= +Date: Sat, 11 Nov 2023 18:17:04 +0100 +Subject: [PATCH] Fix build with >=exiv2-0.28.0, raise minimum to 0.27.0 + +- enables use of EXIV2_TEST_VERSION macro +- add compatibility for exiv2-0.28.0 +--- + meson.build | 2 +- + src/uni-exiv2.cpp | 21 +++++++++++++++------ + 2 files changed, 16 insertions(+), 7 deletions(-) + +diff --git a/meson.build b/meson.build +index 8f91fb5..9ef9f09 100644 +--- a/meson.build ++++ b/meson.build +@@ -28,7 +28,7 @@ viewnior_deps = [ + dependency('gio-2.0', version: glib_ver), + dependency('shared-mime-info', version: '>= 0.20'), + dependency('gdk-pixbuf-2.0', version: '>= 0.21'), +- dependency('exiv2', version: '>= 0.21'), ++ dependency('exiv2', version: '>= 0.27'), + ] + # + +diff --git a/src/uni-exiv2.cpp b/src/uni-exiv2.cpp +index 0d14b9f..d03edd7 100644 +--- a/src/uni-exiv2.cpp ++++ b/src/uni-exiv2.cpp +@@ -22,12 +22,21 @@ + + #include + #include ++#include + + #include "uni-exiv2.hpp" + ++#if EXIV2_TEST_VERSION(0,28,0) ++ typedef Exiv2::Error Exiv2Error; ++ typedef Exiv2::Image::UniquePtr ImagePtr; ++#else ++ typedef Exiv2::AnyError Exiv2Error; ++ typedef Exiv2::Image::AutoPtr ImagePtr; ++#endif ++ + #define ARRAY_SIZE(array) (sizeof array/sizeof(array[0])) + +-static Exiv2::Image::AutoPtr cached_image; ++static ImagePtr cached_image; + + extern "C" + void +@@ -35,7 +44,7 @@ uni_read_exiv2_map(const char *uri, void (*callback)(const char*, const char*, v + { + Exiv2::LogMsg::setLevel(Exiv2::LogMsg::mute); + try { +- Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open(uri); ++ ImagePtr image = Exiv2::ImageFactory::open(uri); + if ( image.get() == 0 ) { + return; + } +@@ -80,7 +89,7 @@ uni_read_exiv2_map(const char *uri, void (*callback)(const char*, const char*, v + } + } + } +- } catch (Exiv2::AnyError& e) { ++ } catch (Exiv2Error& e) { + std::cerr << "Exiv2: '" << e << "'\n"; + } + } +@@ -103,7 +112,7 @@ uni_read_exiv2_to_cache(const char *uri) + } + + cached_image->readMetadata(); +- } catch (Exiv2::AnyError& e) { ++ } catch (Exiv2Error& e) { + std::cerr << "Exiv2: '" << e << "'\n"; + } + +@@ -121,7 +130,7 @@ uni_write_exiv2_from_cache(const char *uri) + } + + try { +- Exiv2::Image::AutoPtr image = Exiv2::ImageFactory::open(uri); ++ ImagePtr image = Exiv2::ImageFactory::open(uri); + if ( image.get() == 0 ) { + return 2; + } +@@ -133,7 +142,7 @@ uni_write_exiv2_from_cache(const char *uri) + cached_image.reset(NULL); + + return 0; +- } catch (Exiv2::AnyError& e) { ++ } catch (Exiv2Error& e) { + std::cerr << "Exiv2: '" << e << "'\n"; + } + +-- +2.41.0 + diff --git a/changelog b/changelog new file mode 100644 index 0000000..867ab73 --- /dev/null +++ b/changelog @@ -0,0 +1,138 @@ +* Sat Jan 22 2022 Fedora Release Engineering - 1.8-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Sat Dec 11 2021 Mukundan Ragavan - 1.8-1 +- Update to 1.8 + +* Fri Jul 23 2021 Fedora Release Engineering - 1.7-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Wed Jan 27 2021 Fedora Release Engineering - 1.7-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Wed Jul 29 2020 Fedora Release Engineering - 1.7-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jan 31 2020 Fedora Release Engineering - 1.7-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Thu Dec 05 2019 Kalev Lember - 1.7-7 +- Use upstream appdata file + +* Sat Jul 27 2019 Fedora Release Engineering - 1.7-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sun Feb 03 2019 Fedora Release Engineering - 1.7-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Wed Jan 30 2019 Rex Dieter - 1.7-4 +- rebuild (exiv2) + +* Mon Jul 16 2018 Mukundan Ragavan - 1.7-3 +- Add gcc-c++ as BR + +* Sat Jul 14 2018 Fedora Release Engineering - 1.7-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Mon May 14 2018 Mukundan Ragavan - 1.7-1 +- Update to 1.7 +- Update spec to use meson build system + +* Fri Feb 09 2018 Fedora Release Engineering - 1.6-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Jan 18 2018 Igor Gnatenko - 1.6-7 +- Remove obsolete scriptlets + +* Thu Aug 03 2017 Fedora Release Engineering - 1.6-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 1.6-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Tue May 02 2017 Rex Dieter - 1.6-4 +- rebuild (exiv2) + +* Sat Feb 11 2017 Fedora Release Engineering - 1.6-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Fri Feb 05 2016 Fedora Release Engineering - 1.6-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Tue Dec 29 2015 Christoph Wickert - 1.6-1 +- Update to 1.6 + +* Wed Jun 24 2015 Rex Dieter - 1.5-3 +- rebuild (exiv2) + +* Fri Jun 19 2015 Fedora Release Engineering - 1.5-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sat May 02 2015 Christoph Wickert - 1.5-1 +- Update to 1.5 + +* Thu Mar 26 2015 Richard Hughes - 1.4-3 +- Add an AppData file for the software center + +* Mon Aug 18 2014 Fedora Release Engineering - 1.4-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Thu Jun 26 2014 Christoph Wickert - 1.4-1 +- Update to 1.4 +- Fix Source0 URL and website +- Update BuildRequires +- Drop obsolete aarch64 patch +- Fix changelog + +* Sun Jun 08 2014 Fedora Release Engineering - 1.3-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Sun Aug 04 2013 Fedora Release Engineering - 1.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Sun May 12 2013 Christoph Wickert - 1.3-4 +- Add aarch64 support (#926697) + +* Fri Feb 15 2013 Fedora Release Engineering - 1.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild + +* Sun Jul 22 2012 Fedora Release Engineering - 1.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild + +* Mon Feb 27 2012 Christoph Wickert - 1.3-1 +- Update to 1.3 +- Drop BR of GConf2-devel (no longer needed) +- As dep on GConf2-(devel) is obsolet, we can now remove the bcond clause, too + +* Sat Feb 25 2012 Christoph Wickert - 1.2-1 +- Update to 1.2 + +* Sat Feb 25 2012 Christoph Wickert - 1.1-4 +- Fix DSO linking error + +* Tue Dec 06 2011 Adam Jackson - 1.1-3 +- Rebuild for new libpng + +* Mon Feb 07 2011 Fedora Release Engineering - 1.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild + +* Thu Dec 16 2010 Christoph Wickert - 1.1-1 +- Update to 1.1 +- Remove obsolete DSO patch +- Add new manpage + +* Wed Mar 31 2010 Christoph Wickert - 1.0-1 +- Update to 1.0 + +* Tue Feb 16 2010 Christoph Wickert - 0.7-2 +- Add patch to fix DSO linking (#565018) +- Switch to %%bcond macro + +* Mon Sep 07 2009 Christoph Wickert - 0.7-1 +- Update to 0.7 + +* Sat Sep 05 2009 Christoph Wickert - 0.6-2 +- Spec file cleanups from review. + +* Mon Aug 03 2009 Christoph Wickert - 0.6-1 +- Initial package diff --git a/sources b/sources index 0df815b..d461460 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (viewnior-1.7.tar.gz) = 5ba17d7b5ceeffa65b04213f179c1439b09ac44e412e0750dde159b118a714f28d3a290509a402b234e4e7ba5b185fc73eef65d418598f344911e4e2c1373fe5 +SHA512 (viewnior-1.8.tar.gz) = 0f9698801172ef6b8f5df4132526b2e605e9aa9fd69cf41a091a3623de9b2e84ca857e625aaa9e83f29df318f70a13fb458bac0df11ae46837b78ef257a00bee diff --git a/viewnior-1.2-dsofix.patch b/viewnior-1.2-dsofix.patch deleted file mode 100644 index b6be895..0000000 --- a/viewnior-1.2-dsofix.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- viewnior-1.2.orig/src/Makefile.in 2012-02-24 22:12:23.000000000 +0100 -+++ viewnior-1.2/src/Makefile.in 2012-02-25 02:17:22.953106423 +0100 -@@ -142,7 +142,7 @@ - INTLTOOL__v_MERGE_ = @INTLTOOL__v_MERGE_@ - INTLTOOL__v_MERGE_0 = @INTLTOOL__v_MERGE_0@ - LD = @LD@ --LDFLAGS = @LDFLAGS@ -+LDFLAGS = @LDFLAGS@ -lm - LIBOBJS = @LIBOBJS@ - LIBS = @LIBS@ - LIBTOOL = @LIBTOOL@ diff --git a/viewnior-1.3-aarch64.patch b/viewnior-1.3-aarch64.patch deleted file mode 100644 index 334cff6..0000000 --- a/viewnior-1.3-aarch64.patch +++ /dev/null @@ -1,265 +0,0 @@ -diff -urN viewnior-1.3/config.guess viewnior-1.3-aarch64/config.guess ---- viewnior-1.3/config.guess 2012-02-26 13:37:08.000000000 -0600 -+++ viewnior-1.3-aarch64/config.guess 2013-03-08 09:25:23.124639150 -0600 -@@ -4,7 +4,7 @@ - # 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, - # 2011, 2012 Free Software Foundation, Inc. - --timestamp='2012-01-01' -+timestamp='2012-09-25' - - # This file is free software; you can redistribute it and/or modify it - # under the terms of the GNU General Public License as published by -@@ -17,9 +17,7 @@ - # General Public License for more details. - # - # You should have received a copy of the GNU General Public License --# along with this program; if not, write to the Free Software --# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA --# 02110-1301, USA. -+# along with this program; if not, see . - # - # As a special exception to the GNU General Public License, if you - # distribute this file as part of a program that contains a -@@ -202,6 +200,10 @@ - # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. - echo "${machine}-${os}${release}" - exit ;; -+ *:Bitrig:*:*) -+ UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` -+ echo ${UNAME_MACHINE_ARCH}-unknown-bitrig${UNAME_RELEASE} -+ exit ;; - *:OpenBSD:*:*) - UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` - echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE} -@@ -304,7 +306,7 @@ - arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) - echo arm-acorn-riscix${UNAME_RELEASE} - exit ;; -- arm:riscos:*:*|arm:RISCOS:*:*) -+ arm*:riscos:*:*|arm*:RISCOS:*:*) - echo arm-unknown-riscos - exit ;; - SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) -@@ -803,6 +805,9 @@ - i*:CYGWIN*:*) - echo ${UNAME_MACHINE}-pc-cygwin - exit ;; -+ *:MINGW64*:*) -+ echo ${UNAME_MACHINE}-pc-mingw64 -+ exit ;; - *:MINGW*:*) - echo ${UNAME_MACHINE}-pc-mingw32 - exit ;; -@@ -863,6 +868,13 @@ - i*86:Minix:*:*) - echo ${UNAME_MACHINE}-pc-minix - exit ;; -+ aarch64:Linux:*:*) -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ exit ;; -+ aarch64_be:Linux:*:*) -+ UNAME_MACHINE=aarch64_be -+ echo ${UNAME_MACHINE}-unknown-linux-gnu -+ exit ;; - alpha:Linux:*:*) - case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in - EV5) UNAME_MACHINE=alphaev5 ;; -@@ -1196,6 +1208,9 @@ - BePC:Haiku:*:*) # Haiku running on Intel PC compatible. - echo i586-pc-haiku - exit ;; -+ x86_64:Haiku:*:*) -+ echo x86_64-unknown-haiku -+ exit ;; - SX-4:SUPER-UX:*:*) - echo sx4-nec-superux${UNAME_RELEASE} - exit ;; -@@ -1251,7 +1266,7 @@ - NEO-?:NONSTOP_KERNEL:*:*) - echo neo-tandem-nsk${UNAME_RELEASE} - exit ;; -- NSE-?:NONSTOP_KERNEL:*:*) -+ NSE-*:NONSTOP_KERNEL:*:*) - echo nse-tandem-nsk${UNAME_RELEASE} - exit ;; - NSR-?:NONSTOP_KERNEL:*:*) -@@ -1320,11 +1335,11 @@ - i*86:AROS:*:*) - echo ${UNAME_MACHINE}-pc-aros - exit ;; -+ x86_64:VMkernel:*:*) -+ echo ${UNAME_MACHINE}-unknown-esx -+ exit ;; - esac - --#echo '(No uname command or uname output not recognized.)' 1>&2 --#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2 -- - eval $set_cc_for_build - cat >$dummy.c <. - # - # As a special exception to the GNU General Public License, if you - # distribute this file as part of a program that contains a -@@ -125,13 +123,17 @@ - maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` - case $maybe_os in - nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ -- linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ -+ linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ - knetbsd*-gnu* | netbsd*-gnu* | \ - kopensolaris*-gnu* | \ - storm-chaos* | os2-emx* | rtmk-nova*) - os=-$maybe_os - basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` - ;; -+ android-linux) -+ os=-linux-android -+ basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown -+ ;; - *) - basic_machine=`echo $1 | sed 's/-[^-]*$//'` - if [ $basic_machine != $1 ] -@@ -154,7 +156,7 @@ - -convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\ - -c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \ - -harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \ -- -apple | -axis | -knuth | -cray | -microblaze) -+ -apple | -axis | -knuth | -cray | -microblaze*) - os= - basic_machine=$1 - ;; -@@ -223,6 +225,12 @@ - -isc*) - basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` - ;; -+ -lynx*178) -+ os=-lynxos178 -+ ;; -+ -lynx*5) -+ os=-lynxos5 -+ ;; - -lynx*) - os=-lynxos - ;; -@@ -247,6 +255,7 @@ - # Some are omitted here because they have special meanings below. - 1750a | 580 \ - | a29k \ -+ | aarch64 | aarch64_be \ - | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ - | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ - | am33_2.0 \ -@@ -264,7 +273,7 @@ - | le32 | le64 \ - | lm32 \ - | m32c | m32r | m32rle | m68000 | m68k | m88k \ -- | maxq | mb | microblaze | mcore | mep | metag \ -+ | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ - | mips | mipsbe | mipseb | mipsel | mipsle \ - | mips16 \ - | mips64 | mips64el \ -@@ -319,7 +328,7 @@ - c6x) - basic_machine=tic6x-unknown - ;; -- m6811 | m68hc11 | m6812 | m68hc12 | picochip) -+ m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip) - basic_machine=$basic_machine-unknown - os=-none - ;; -@@ -332,7 +341,10 @@ - strongarm | thumb | xscale) - basic_machine=arm-unknown - ;; -- -+ xgate) -+ basic_machine=$basic_machine-unknown -+ os=-none -+ ;; - xscaleeb) - basic_machine=armeb-unknown - ;; -@@ -355,6 +367,7 @@ - # Recognize the basic CPU types with company name. - 580-* \ - | a29k-* \ -+ | aarch64-* | aarch64_be-* \ - | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ - | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ - | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ -@@ -376,7 +389,8 @@ - | lm32-* \ - | m32c-* | m32r-* | m32rle-* \ - | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ -- | m88110-* | m88k-* | maxq-* | mcore-* | metag-* | microblaze-* \ -+ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ -+ | microblaze-* | microblazeel-* \ - | mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \ - | mips16-* \ - | mips64-* | mips64el-* \ -@@ -775,9 +789,13 @@ - basic_machine=ns32k-utek - os=-sysv - ;; -- microblaze) -+ microblaze*) - basic_machine=microblaze-xilinx - ;; -+ mingw64) -+ basic_machine=x86_64-pc -+ os=-mingw64 -+ ;; - mingw32) - basic_machine=i386-pc - os=-mingw32 -@@ -1339,15 +1357,15 @@ - | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ - | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ - | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ -- | -openbsd* | -solidbsd* \ -+ | -bitrig* | -openbsd* | -solidbsd* \ - | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ - | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ - | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ - | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \ - | -chorusos* | -chorusrdb* | -cegcc* \ - | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ -- | -mingw32* | -linux-gnu* | -linux-android* \ -- | -linux-newlib* | -linux-uclibc* \ -+ | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ -+ | -linux-newlib* | -linux-musl* | -linux-uclibc* \ - | -uxpv* | -beos* | -mpeix* | -udk* \ - | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ - | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ -@@ -1530,6 +1548,9 @@ - c4x-* | tic4x-*) - os=-coff - ;; -+ hexagon-*) -+ os=-elf -+ ;; - tic54x-*) - os=-coff - ;; diff --git a/viewnior.spec b/viewnior.spec index a5bf1bc..1432277 100644 --- a/viewnior.spec +++ b/viewnior.spec @@ -1,12 +1,12 @@ Name: viewnior -Version: 1.7 -Release: 1%{?dist} +Version: 1.8 +Release: %autorelease Summary: Elegant image viewer -Group: User Interface/X -License: GPLv3+ +License: GPL-3.0-or-later URL: http://siyanpanayotov.com/project/viewnior/ -Source0: https://github.com/hellosiyan/Viewnior/archive/%{name}-%{version}.tar.gz +Source: https://github.com/hellosiyan/Viewnior/archive/%{name}-%{version}.tar.gz +Patch: 0001-Fix-build-with-exiv2-0.28.0-raise-minimum-to-0.27.0.patch BuildRequires: pkgconfig(gtk+-2.0) >= 2.20 BuildRequires: pkgconfig(glib-2.0) >= 2.32 @@ -18,7 +18,9 @@ BuildRequires: desktop-file-utils BuildRequires: gettext BuildRequires: meson BuildRequires: gnome-common - +BuildRequires: gcc-c++ +BuildRequires: libappstream-glib +Requires: webp-pixbuf-loader %description Viewnior is an image viewer program. Created to be simple, fast and elegant. @@ -35,7 +37,7 @@ its features are: %prep -%setup -qn Viewnior-%{name}-%{version} +%autosetup -n Viewnior-%{name}-%{version} -p1 %build %meson @@ -49,154 +51,19 @@ its features are: desktop-file-validate %{buildroot}/%{_datadir}/applications/%{name}.desktop -# Register as an application to be visible in the software center -# -# NOTE: It would be *awesome* if this file was maintained by the upstream -# project, translated and installed into the right place during `make install`. -# -# See http://www.freedesktop.org/software/appstream/docs/ for more details. -# -mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata -cat > $RPM_BUILD_ROOT%{_datadir}/appdata/%{name}.appdata.xml < - - - - viewnior.desktop - CC0-1.0 - Simple image viewer and editor - -

- Viewnior is a simple and elegant image viewer with a minimal interface that - provides as much screen real estate as possible to view your images. - It has a wide range of features, including: fullscreen and slideshow modes, - the ability to rotate, flip and crop images, support for animations (GIF), - support for reading image metadata, and the ability to configure mouse actions. -

- - http://siyanpanayotov.com/project/viewnior/ - - http://siyanpanayotov.com/wp-content/uploads/2014/04/vnr_normal_mode_2.png - http://siyanpanayotov.com/wp-content/uploads/2014/04/vnr_pref_window.png - http://siyanpanayotov.com/wp-content/uploads/2014/04/vnr_navigation_window.png - - -EOF +appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{name}.metainfo.xml + %files -f %{name}.lang %license COPYING %doc AUTHORS NEWS TODO %{_bindir}/%{name} -%{_datadir}/appdata/%{name}.appdata.xml +%{_metainfodir}/%{name}.metainfo.xml %{_datadir}/applications/%{name}.desktop %{_datadir}/icons/hicolor/*/apps/%{name}.* %{_datadir}/%{name}/ -%{_mandir}/man*/%{name}.* +%{_mandir}/man*/%{name}* %changelog -* Mon May 14 2018 Mukundan Ragavan - 1.7-1 -- Update to 1.7 -- Update spec to use meson build system - -* Fri Feb 09 2018 Fedora Release Engineering - 1.6-8 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - -* Thu Jan 18 2018 Igor Gnatenko - 1.6-7 -- Remove obsolete scriptlets - -* Thu Aug 03 2017 Fedora Release Engineering - 1.6-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild - -* Thu Jul 27 2017 Fedora Release Engineering - 1.6-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild - -* Tue May 02 2017 Rex Dieter - 1.6-4 -- rebuild (exiv2) - -* Sat Feb 11 2017 Fedora Release Engineering - 1.6-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild - -* Fri Feb 05 2016 Fedora Release Engineering - 1.6-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild - -* Tue Dec 29 2015 Christoph Wickert - 1.6-1 -- Update to 1.6 - -* Wed Jun 24 2015 Rex Dieter - 1.5-3 -- rebuild (exiv2) - -* Fri Jun 19 2015 Fedora Release Engineering - 1.5-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild - -* Sat May 02 2015 Christoph Wickert - 1.5-1 -- Update to 1.5 - -* Thu Mar 26 2015 Richard Hughes - 1.4-3 -- Add an AppData file for the software center - -* Mon Aug 18 2014 Fedora Release Engineering - 1.4-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild - -* Thu Jun 26 2014 Christoph Wickert - 1.4-1 -- Update to 1.4 -- Fix Source0 URL and website -- Update BuildRequires -- Drop obsolete aarch64 patch -- Fix changelog - -* Sun Jun 08 2014 Fedora Release Engineering - 1.3-6 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild - -* Sun Aug 04 2013 Fedora Release Engineering - 1.3-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild - -* Sun May 12 2013 Christoph Wickert - 1.3-4 -- Add aarch64 support (#926697) - -* Fri Feb 15 2013 Fedora Release Engineering - 1.3-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild - -* Sun Jul 22 2012 Fedora Release Engineering - 1.3-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild - -* Mon Feb 27 2012 Christoph Wickert - 1.3-1 -- Update to 1.3 -- Drop BR of GConf2-devel (no longer needed) -- As dep on GConf2-(devel) is obsolet, we can now remove the bcond clause, too - -* Sat Feb 25 2012 Christoph Wickert - 1.2-1 -- Update to 1.2 - -* Sat Feb 25 2012 Christoph Wickert - 1.1-4 -- Fix DSO linking error - -* Tue Dec 06 2011 Adam Jackson - 1.1-3 -- Rebuild for new libpng - -* Mon Feb 07 2011 Fedora Release Engineering - 1.1-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild - -* Thu Dec 16 2010 Christoph Wickert - 1.1-1 -- Update to 1.1 -- Remove obsolete DSO patch -- Add new manpage - -* Wed Mar 31 2010 Christoph Wickert - 1.0-1 -- Update to 1.0 - -* Tue Feb 16 2010 Christoph Wickert - 0.7-2 -- Add patch to fix DSO linking (#565018) -- Switch to %%bcond macro - -* Mon Sep 07 2009 Christoph Wickert - 0.7-1 -- Update to 0.7 - -* Sat Sep 05 2009 Christoph Wickert - 0.6-2 -- Spec file cleanups from review. - -* Mon Aug 03 2009 Christoph Wickert - 0.6-1 -- Initial package +%autochangelog