[packages/viewnior] - updated to 1.6 - pl - use upstream appdata file, just apply patch to fix syntax

qboosh qboosh at pld-linux.org
Sun Sep 11 07:54:16 CEST 2016


commit 94cf7f35b3c06585eeb73f63813d93fd5230cdf8
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sun Sep 11 07:55:42 2016 +0200

    - updated to 1.6
    - pl
    - use upstream appdata file, just apply patch to fix syntax

 viewnior-appdata.patch |  9 +++++++
 viewnior.appdata.xml   | 26 --------------------
 viewnior.spec          | 67 +++++++++++++++++++++++++++++++++++++++-----------
 3 files changed, 61 insertions(+), 41 deletions(-)
---
diff --git a/viewnior.spec b/viewnior.spec
index 32f6aa4..187f1fb 100644
--- a/viewnior.spec
+++ b/viewnior.spec
@@ -1,23 +1,35 @@
 Summary:	Elegant image viewer
+Summary(pl.UTF-8):	Elegancka przeglądarka obrazków
 Name:		viewnior
-Version:	1.5
+Version:	1.6
 Release:	1
 License:	GPL v3+
 Group:		X11/Applications
+#Source0Download: https://github.com/xsisqox/Viewnior/releases
 Source0:	https://github.com/xsisqox/Viewnior/archive/%{name}-%{version}.tar.gz
-# Source0-md5:	3cecdc212724d5963257bebf025943f5
-Source1:	viewnior.appdata.xml
+# Source0-md5:	f7d497360c48ce4bce09328d934cc4a4
+Patch0:		%{name}-appdata.patch
 URL:		http://siyanpanayotov.com/project/viewnior/
+BuildRequires:	autoconf >= 2.61
+BuildRequires:	automake >= 1:1.11
 BuildRequires:	desktop-file-utils
 BuildRequires:	exiv2-devel >= 0.21
 BuildRequires:	gdk-pixbuf2-devel >= 2.4.0
 BuildRequires:	gettext-devel
-BuildRequires:	glib2-devel >= 2.32
-BuildRequires:	gnome-common
-BuildRequires:	gtk+2-devel >= 2.20
-BuildRequires:	intltool
+BuildRequires:	glib2-devel >= 1:2.32
+BuildRequires:	gtk+2-devel >= 2:2.20
+BuildRequires:	intltool >= 0.35.0
 BuildRequires:	libtool
+BuildRequires:	pkgconfig
 BuildRequires:	shared-mime-info >= 0.20
+Requires(post,postun):	desktop-file-utils
+Requires(post,postun):	gtk-update-icon-cache
+Requires:	exiv2-libs >= 0.21
+Requires:	gdk-pixbuf2 >= 2.4.0
+Requires:	glib2 >= 1:2.32
+Requires:	gtk+2 >= 2:2.20
+Requires:	hicolor-icon-theme
+Requires:	shared-mime-info >= 0.20
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -34,11 +46,33 @@ Among its features are:
 - Simple interface
 - Configurable mouse actions
 
+%description -l pl.UTF-8
+Viewnior to przeglądarka obrazków. Stworzona z myślą o prostocie,
+szybkości i elegancji. Minimalistyczny interfejs pozostawia więcej
+miejsca na ekranie dla obrazów.
+
+Możliwości obejmują między innymi:
+- tryb pełnoekranowy i przeglądu slajdów
+- obracanie, odwracanie, zapis i usuwanie obrazów
+- obsługę animacji
+- przeglądanie tylko wybranych obrazów
+- okno nawigacji
+- prosty interfejs
+- konfigurowalne akcje myszy
+
 %prep
 %setup -qn Viewnior-%{name}-%{version}
+%patch0 -p1
 
 %build
-./autogen.sh
+install -d m4
+%{__glib_gettextize}
+%{__intltoolize}
+%{__libtoolize}
+%{__aclocal} -I m4
+%{__autoconf}
+%{__autoheader}
+%{__automake}
 %configure \
 	--disable-silent-rules \
 	--enable-wallpaper
@@ -55,8 +89,10 @@ rm -rf $RPM_BUILD_ROOT
 
 desktop-file-validate $RPM_BUILD_ROOT%{_desktopdir}/%{name}.desktop
 
+# check when manual install becomes obsolete and can be dropped
+test ! -f $RPM_BUILD_ROOT%{_datadir}/appdata/viewnior.appdata.xml || exit 1
 install -d $RPM_BUILD_ROOT%{_datadir}/appdata
-cp -p %{SOURCE1} $RPM_BUILD_ROOT%{_datadir}/appdata/%{name}.appdata.xml
+cp -p data/%{name}.appdata.xml $RPM_BUILD_ROOT%{_datadir}/appdata/%{name}.appdata.xml
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -71,10 +107,11 @@ rm -rf $RPM_BUILD_ROOT
 
 %files -f %{name}.lang
 %defattr(644,root,root,755)
-%doc AUTHORS ChangeLog-20090517 COPYING NEWS README TODO
-%attr(755,root,root) %{_bindir}/%{name}
-%{_mandir}/man*/%{name}*
-%{_datadir}/appdata/%{name}.appdata.xml
-%{_desktopdir}/%{name}.desktop
-%{_iconsdir}/hicolor/*/apps/%{name}.*
+%doc AUTHORS ChangeLog-20090517 NEWS README TODO
+%attr(755,root,root) %{_bindir}/viewnior
 %{_datadir}/%{name}
+%{_datadir}/appdata/viewnior.appdata.xml
+%{_desktopdir}/viewnior.desktop
+%{_iconsdir}/hicolor/*x*/apps/viewnior.png
+%{_iconsdir}/hicolor/scalable/apps/viewnior.svg
+%{_mandir}/man1/viewnior.1*
diff --git a/viewnior-appdata.patch b/viewnior-appdata.patch
new file mode 100644
index 0000000..26aa7d2
--- /dev/null
+++ b/viewnior-appdata.patch
@@ -0,0 +1,9 @@
+--- Viewnior-viewnior-1.6/data/viewnior.appdata.xml.orig	2015-12-17 17:33:39.000000000 +0100
++++ Viewnior-viewnior-1.6/data/viewnior.appdata.xml	2016-09-11 07:48:44.453621283 +0200
+@@ -20,4 +20,4 @@
+     <screenshot>http://siyanpanayotov.com/wp-content/uploads/2014/04/vnr_navigation_window.png</screenshot>
+   </screenshots>
+   <updatecontact>hello_at_siyanpanayotov.com</updatecontact>
+-</application>
+\ No newline at end of file
++</component>
diff --git a/viewnior.appdata.xml b/viewnior.appdata.xml
deleted file mode 100644
index 0b74a00..0000000
--- a/viewnior.appdata.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Copyright 2014 Ryan Lerch <rlerch at redhat.com> -->
-<!--
-BugReportURL: https://bugs.launchpad.net/viewnior/+bug/1323677
-SentUpstream: 2014-09-18
--->
-<application>
-  <id type="desktop">viewnior.desktop</id>
-  <metadata_license>CC0-1.0</metadata_license>
-  <summary>Simple image viewer and editor</summary>
-  <description>
-    <p>
-      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.
-    </p>
-  </description>
-  <url type="homepage">http://siyanpanayotov.com/project/viewnior/</url>
-  <screenshots>
-    <screenshot type="default">http://siyanpanayotov.com/wp-content/uploads/2014/04/vnr_normal_mode_2.png</screenshot>
-    <screenshot>http://siyanpanayotov.com/wp-content/uploads/2014/04/vnr_pref_window.png</screenshot>
-    <screenshot>http://siyanpanayotov.com/wp-content/uploads/2014/04/vnr_navigation_window.png</screenshot>
-  </screenshots>
-</application>
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/viewnior.git/commitdiff/94cf7f35b3c06585eeb73f63813d93fd5230cdf8



More information about the pld-cvs-commit mailing list