From 2b5a6e947a067de8aac506aa8490f38f99325c80 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Nov 19 2018 12:31:57 +0000 Subject: Update to 2.0.0 release --- diff --git a/sources b/sources index d233846..616a248 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xreader-1.8.5.tar.gz) = 3b185fd993d1a94a50ef29867ca56ef3c692d25d07b267fe34d362bc2f58bf7d95fb699423137fe688af734407da27e144c89559c7af23d053f112189ef33599 +SHA512 (xreader-2.0.0.tar.gz) = 1966eb610bda122dc0c6460a6274fd031b5dd5b61557f458c0446661481efa52e91e7763b5468cfa1686c69422f158be7c430fb5d84a039e4a91bd24b73e169b diff --git a/xreader.spec b/xreader.spec index 83fecd3..9e0860c 100644 --- a/xreader.spec +++ b/xreader.spec @@ -2,7 +2,7 @@ %global __provides_exclude_from ^%{_libdir}/%{name}/.*$ Name: xreader -Version: 1.8.5 +Version: 2.0.0 Release: 1%{?dist} Summary: Simple document viewer @@ -25,11 +25,7 @@ BuildRequires: pkgconfig(gthread-2.0) BuildRequires: pkgconfig(gtk+-2.0) BuildRequires: pkgconfig(gtk+-3.0) BuildRequires: pkgconfig(gtk+-unix-print-3.0) -%if 0%{?fedora} || 0%{?rhel} >= 8 BuildRequires: pkgconfig(kpathsea) -%else -BuildRequires: texlive-kpathsea-lib-devel -%endif BuildRequires: pkgconfig(libgxps) BuildRequires: pkgconfig(libsecret-1) BuildRequires: pkgconfig(libspectre) @@ -37,7 +33,7 @@ BuildRequires: pkgconfig(libtiff-4) BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(poppler-glib) BuildRequires: pkgconfig(sm) -BuildRequires: pkgconfig(xapp) >= 1.2.0 +BuildRequires: pkgconfig(xapp) >= 1.4.0 BuildRequires: pkgconfig(zlib) BuildRequires: pkgconfig(webkit2gtk-4.0) BuildRequires: texlive @@ -47,20 +43,11 @@ Requires: shared-mime-info%{?_isa} Requires: gsettings-desktop-schemas%{?_isa} Requires: xapps%{?_isa} -%if 0%{?fedora} || 0%{?rhel} >= 8 Recommends: yelp%{?_isa} -%else # 0%%{?fedora} || 0%%{?rhel} >= 8 -Requires: yelp%{?_isa} -Requires(post): desktop-file-utils -Requires(postun): desktop-file-utils -%endif # 0%%{?fedora} || 0%%{?rhel} >= 8 - -Obsoletes: nemo-extension-%{name} < %{version}-%{release} -Obsoletes: caja-extension-%{name} < %{version}-%{release} %description X-Apps Document Reader is a document viewer capable of displaying -multiple and singlepage document formats like PDF and PostScript. +multiple and single page document formats like PDF and PostScript. %package devel @@ -73,7 +60,6 @@ This package contains the development files for %{name}. %package doc Summary: Documentation files for %{name} - BuildArch: noarch %description doc @@ -88,11 +74,11 @@ NOCONFIGURE=1 %{_bindir}/gnome-autogen.sh %build export LDFLAGS="-Wl,--as-needed %{__global_ldflags}" %configure \ - --disable-silent-rules \ - --disable-static \ - --enable-gtk-doc \ - --enable-introspection \ - --enable-pixbuf + --disable-silent-rules \ + --disable-static \ + --enable-gtk-doc \ + --enable-introspection \ + --enable-pixbuf %make_build @@ -102,43 +88,20 @@ export LDFLAGS="-Wl,--as-needed %{__global_ldflags}" %{_bindir}/find %{buildroot} -type f -name '*.a' -print -delete %{_bindir}/find %{buildroot} -type f -name '*.la' -print -delete %{__sed} -i -e '/.*.*/d' \ - %{buildroot}%{_datadir}/appdata/*.appdata.xml + %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml %find_lang %{name} %check # Validate desktop-files. %{_bindir}/desktop-file-validate \ - %{buildroot}%{_datadir}/applications/*.desktop + %{buildroot}%{_datadir}/applications/%{name}.desktop # Validate AppData-files. %{_bindir}/appstream-util validate-relax --nonet \ - %{buildroot}%{_datadir}/appdata/*.appdata.xml - -%if (0%{?rhel} && 0%{?rhel <= 7}) -%post -/sbin/ldconfig -/bin/touch %{_datadir}/icons/hicolor >&/dev/null || : -%{_bindir}/update-desktop-database &> /dev/null || : - -%postun -/sbin/ldconfig -if [ $1 -eq 0 ]; then - /bin/touch --no-create %{_datadir}/icons/hicolor >&/dev/null || : - %{_bindir}/gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || : -fi -%{_bindir}/update-desktop-database &> /dev/null || : -if [ $1 -eq 0 ] ; then - %{_bindir}/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : -fi - -%posttrans -%{_bindir}/gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || : -%{_bindir}/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : -%else # (0%%{?rhel} && 0%%{?rhel <= 7}) -%ldconfig_scriptlets -%endif # (0%%{?rhel} && 0%%{?rhel <= 7}) + %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml +%ldconfig_scriptlets %files -f %{name}.lang %license AUTHORS COPYING debian/copyright @@ -174,6 +137,9 @@ fi %changelog +* Mon Nov 19 2018 Leigh Scott - 2.0.0-1 +- Update to 2.0.0 release + * Wed Aug 15 2018 Leigh Scott - 1.8.5-1 - Update to 1.8.5 release