diff --git a/sources b/sources index 5cccc82..c957333 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (xreader-1.6.2.tar.gz) = f32d8113a93a82da51e711c983ba0a720edc012f14b977adb0227b1531cb0ae1a6ab3809c4199233ed9b6d185cdfc038af55f68bec1d2ac252d9bb1859209a0c +SHA512 (xreader-1.8.1.tar.gz) = 78c0ba940a705781d42f6c0a55581f0a90c237d86c9bc091f6c3d8b8f71253e180c2ad2bfc828f0d0bf389cb3064b437efd2e53435215cf25728aa0bc2396365 diff --git a/xreader.spec b/xreader.spec index a5b48fd..aa76361 100644 --- a/xreader.spec +++ b/xreader.spec @@ -1,17 +1,9 @@ # Filter provides from plugins. %global __provides_exclude_from ^%{_libdir}/%{name}/.*$ -# Caja in Fedora <= 25 is to old for the extension. -%if 0%{?fedora} >= 26 || 0%{?rhel} >= 8 -%global caja_ext 1 -%else # 0%%{?fedora} >= 26 || 0%%{?rhel} >= 8 -%global caja_ext 0 -%endif # 0%%{?fedora} >= 26 || 0%%{?rhel} >= 8 - - Name: xreader -Version: 1.6.2 -Release: 2%{?dist} +Version: 1.8.1 +Release: 1%{?dist} Summary: Simple document viewer License: GPLv2+ @@ -37,17 +29,14 @@ BuildRequires: pkgconfig(kpathsea) %else BuildRequires: texlive-kpathsea-lib-devel %endif -%if 0%{?caja_ext} -BuildRequires: pkgconfig(libcaja-extension) -%endif # 0%%{?caja_ext} BuildRequires: pkgconfig(libgxps) -BuildRequires: pkgconfig(libnemo-extension) BuildRequires: pkgconfig(libsecret-1) BuildRequires: pkgconfig(libspectre) BuildRequires: pkgconfig(libtiff-4) BuildRequires: pkgconfig(libxml-2.0) BuildRequires: pkgconfig(poppler-glib) BuildRequires: pkgconfig(sm) +BuildRequires: pkgconfig(xapp) >= 1.2.0 BuildRequires: pkgconfig(zlib) BuildRequires: pkgconfig(webkit2gtk-4.0) BuildRequires: texlive @@ -65,6 +54,9 @@ 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. @@ -72,7 +64,7 @@ multiple and singlepage document formats like PDF and PostScript. %package devel Summary: Development files for %{name} -Requires: %{name}%{?_isa} == %{version}-%{release} +Requires: %{name}%{?_isa} == %{version}-%{release} %description devel This package contains the development files for %{name}. @@ -87,55 +79,18 @@ BuildArch: noarch This package contains the documentation files for %{name}. -%package -n nemo-extension-%{name} -Summary: X-Apps Document Reader file manager extension - -Requires: nemo -Requires: %{name}%{?_isa} == %{version}-%{release} - -%description -n nemo-extension-%{name} -X-Apps Document Reader is a document viewer capable of displaying -multiple and singlepage document formats like PDF and PostScript. - -This package contains the xreader extension for the -Nemo file manager. -It adds an additional tab called "Document" to the file properties -dialog. - - -%if 0%{?caja_ext} -%package -n caja-extension-%{name} -Summary: X-Apps Document Reader file manager extension - -Requires: caja -Requires: %{name}%{?_isa} == %{version}-%{release} - -%description -n caja-extension-%{name} -X-Apps Document Reader is a document viewer capable of displaying -multiple and singlepage document formats like PDF and PostScript. - -This package contains the xreader extension for the -Caja file manager. -It adds an additional tab called "Document" to the file properties -dialog. -%endif # 0%%{?caja_ext} - - %prep -%autosetup -p 1 +%autosetup -p1 NOCONFIGURE=1 %{_bindir}/gnome-autogen.sh %build export LDFLAGS="-Wl,--as-needed %{__global_ldflags}" -%configure \ - --disable-silent-rules \ - --disable-static \ -%if 0%{?caja_ext} == 0 - --disable-caja \ -%endif # 0%%{?caja_ext} == 0 - --enable-gtk-doc \ - --enable-introspection \ +%configure \ + --disable-silent-rules \ + --disable-static \ + --enable-gtk-doc \ + --enable-introspection \ --enable-pixbuf %make_build @@ -145,27 +100,25 @@ export LDFLAGS="-Wl,--as-needed %{__global_ldflags}" %make_install %{_bindir}/find %{buildroot} -type f -name '*.a' -print -delete %{_bindir}/find %{buildroot} -type f -name '*.la' -print -delete -%{__sed} -i -e '/.*.*/d' \ +%{__sed} -i -e '/.*.*/d' \ %{buildroot}%{_datadir}/appdata/*.appdata.xml %find_lang %{name} %check # Validate desktop-files. -%{_bindir}/desktop-file-validate \ +%{_bindir}/desktop-file-validate \ %{buildroot}%{_datadir}/applications/*.desktop # Validate AppData-files. -%{_bindir}/appstream-util validate-relax --nonet \ +%{_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 || : -%if (0%{?fedora} && 0%{?fedora} <=24) || (0%{?rhel} && 0%{?rhel} <= 7) %{_bindir}/update-desktop-database &> /dev/null || : -%endif (0%%{?fedora} && 0%%{?fedora} <=24) || (0%%{?rhel} && 0%%{?rhel} <= 7) %postun /sbin/ldconfig @@ -173,42 +126,41 @@ 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 -%if (0%{?fedora} && 0%{?fedora} <=24) || (0%{?rhel} && 0%{?rhel} <= 7) %{_bindir}/update-desktop-database &> /dev/null || : if [ $1 -eq 0 ] ; then %{_bindir}/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : fi -%endif (0%%{?fedora} && 0%%{?fedora} <=24) || (0%%{?rhel} && 0%%{?rhel} <= 7) %posttrans %{_bindir}/gtk-update-icon-cache %{_datadir}/icons/hicolor >&/dev/null || : -%if (0%{?fedora} && 0%{?fedora} <=24) || (0%{?rhel} && 0%{?rhel} <= 7) %{_bindir}/glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || : -%endif (0%%{?fedora} && 0%%{?fedora} <=24) || (0%%{?rhel} && 0%%{?rhel} <= 7) +%else # (0%%{?rhel} && 0%%{?rhel <= 7}) +%ldconfig_scriptlets +%endif # (0%%{?rhel} && 0%%{?rhel <= 7}) %files -f %{name}.lang %license AUTHORS COPYING debian/copyright %doc ChangeLog README debian/changelog %{_bindir}/%{name}* -%{_datadir}/%{name} +%{_datadir}/%{name}/ %{_datadir}/applications/%{name}.desktop %{_datadir}/appdata/%{name}.appdata.xml %{_datadir}/dbus-1/services/* %{_datadir}/glib-2.0/schemas/* -%{_datadir}/help/*/%{name} +%{_datadir}/help/*/%{name}/ %{_datadir}/icons/hicolor/*/*/* %{_datadir}/thumbnailers/%{name}.thumbnailer %{_libdir}/girepository-1.0/* %{_libdir}/*.so.* -%{_libdir}/%{name} +%{_libdir}/%{name}/ %{_libexecdir}/%{name}* %{_mandir}/man?/*.* %files devel %{_datadir}/gir-1.0/* -%{_includedir}/%{name} +%{_includedir}/%{name}/ %{_libdir}/*.so %{_libdir}/pkgconfig/xreader-document-1.5.pc %{_libdir}/pkgconfig/xreader-view-1.5.pc @@ -220,25 +172,10 @@ fi %{_datadir}/gtk-doc -%files -n nemo-extension-%{name} -# This directory is not owned by any other package, -# maybe should be added to the nemo package -%dir %{_datadir}/nemo/extensions/ -%{_datadir}/nemo/extensions/libxreader-properties-page.nemo-extension -%{_libdir}/nemo/extensions-3.0/libxreader-properties-page.so - - -%if 0%{?caja_ext} -%files -n caja-extension-%{name} -# This directory is not owned by any other package, -# maybe should be added to the caja package -%dir %{_datadir}/caja/extensions/ -%{_datadir}/caja/extensions/libxreader-properties-page.caja-extension -%{_libdir}/caja/extensions-2.0/libxreader-properties-page.so -%endif # 0%%{?caja_ext} - - %changelog +* Thu May 10 2018 Leigh Scott - 1.8.1-1 +- Update to 1.8.1 release + * Fri Feb 09 2018 Fedora Release Engineering - 1.6.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild