#1 Update to 2.1.0.1
Closed 5 years ago by slankes. Opened 5 years ago by tosky.
rpms/ tosky/skanlite master  into  master

file modified
+28 -51
@@ -1,6 +1,6 @@ 

  Name:           skanlite

- Version:        1.1

- Release:        13%{?dist}

+ Version:        2.1.0.1

+ Release:        1%{?dist}

  Summary:        Lightweight scanning program

  Group:          Applications/Productivity

  # Actually: GPLv2 or GPLv3 or any later Version approved by KDE e.V.
@@ -8,17 +8,25 @@ 

  URL:            https://www.kde.org/applications/graphics/%{name}/

  Source0:        http://download.kde.org/stable/%{name}/%{version}/src/%{name}-%{version}.tar.xz

  

- BuildRequires: gettext

- BuildRequires: kdelibs4-devel

- BuildRequires: libappstream-glib

+ BuildRequires: extra-cmake-modules

+ BuildRequires: kf5-rpm-macros

+ BuildRequires: cmake(KF5CoreAddons)

+ BuildRequires: cmake(KF5DocTools)

+ BuildRequires: cmake(KF5I18n)

+ BuildRequires: cmake(KF5KIO)

+ BuildRequires: cmake(KF5XmlGui)

+ 

  BuildRequires: libpng-devel

- BuildRequires: pkgconfig(libksane) 

+ BuildRequires: cmake(KF5Sane)

+ 

+ # requirements for %check

+ BuildRequires: desktop-file-utils

+ BuildRequires: libappstream-glib

+ 

  %if 0%{?rhel}

  ExcludeArch: ppc64 ppc64le

  %endif

  

- %{?_kde4_version:Requires: kdelibs4 >= %{_kde4_version}}

- 

  %description

  Skanlite is a light-weight scanning application based on libksane.

  
@@ -28,7 +36,7 @@ 

  %build

  mkdir -p %{_target_platform}

  pushd %{_target_platform}

- %{cmake_kde4} ..

+ %{cmake_kf5} ..

  popd

  

  make %{?_smp_mflags} -C %{_target_platform}
@@ -36,56 +44,25 @@ 

  %install

  make install/fast DESTDIR=%{buildroot} -C %{_target_platform}

  

- # 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 <<EOF

- <?xml version="1.0" encoding="UTF-8"?>

- <!-- Copyright 2014 Ryan Lerch <rlerch@redhat.com> -->

- <component type="desktop">

-   <id>skanlite.desktop</id>

-   <metadata_license>CC0-1.0</metadata_license>

-   <summary>Scan images</summary>

-   <description>

-     <p>

-       Skanlite is an application to scan images using a hardware scanner attached to your computer.

-       It is able to save in a variety of image formats (including JPEG) and can even

-       save your scan as a PDF.

-       Skanlite also has support for scanning multiple pages and merging them

-       into a single document.

-     </p>

-   </description>

-   <url type="homepage">http://kde-apps.org/content/show.php?content=109803</url>

-   <screenshots>

-     <screenshot type="default">

-       <image>http://kde-apps.org/CONTENT/content-pre1/109803-1.png</image>

-     </screenshot>

-     <screenshot>

-       <image>http://kde-apps.org/CONTENT/content-pre2/109803-2.png</image>

-     </screenshot>

-   </screenshots>

- </component>

- EOF

- 

- %find_lang %{name} --with-kde 

+ %find_lang %{name} --with-kde --with-html

  

  %check

- desktop-file-validate %{buildroot}%{_datadir}/applications/kde4/%{name}.desktop

- appstream-util validate-relax --nonet %{buildroot}/%{_datadir}/appdata/%{name}.appdata.xml

+ desktop-file-validate %{buildroot}%{_kf5_datadir}/applications/org.kde.%{name}.desktop

+ appstream-util validate-relax --nonet %{buildroot}/%{_kf5_metainfodir}/org.kde.%{name}.appdata.xml

  

  %files -f %{name}.lang

  %license src/COPYING

  %doc src/TODO

- %{_kde4_bindir}/%{name}

- %{_kde4_datadir}/appdata/%{name}.appdata.xml

- %{_kde4_datadir}/applications/kde4/%{name}.desktop

+ %{_kf5_bindir}/%{name}

+ %{_kf5_metainfodir}/org.kde.%{name}.appdata.xml

+ %{_kf5_datadir}/applications/org.kde.%{name}.desktop

  

  %changelog

+ * Sat Aug 04 2018 Luigi Toscano <luigi.toscano@tiscali.it> - 2.1.0.1-1

+ - Update to 2.1.0.1

+ - Adapt the spec file to the base requirements (Qt5/KF5)

+ - Remove the inline AppData file (the program provides it)

+ 

  * Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.1-13

  - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild

  

file modified
+1 -1
@@ -1,1 +1,1 @@ 

- 21cd642d4177fff759bf4694af39b9fe  skanlite-1.1.tar.xz

+ SHA512 (skanlite-2.1.0.1.tar.xz) = 8eb1a32994259010d4a134c1b25b74b8cc03ba4fa6ce70ee2026a3070c675c2b11f38770453d197008fbe12df976cc653362eb44d6ef89a7f0173c3a2cef3658

  • Adapt the spec file to the base requirements (Qt5/KF5)
  • Remove the inline AppData file (the program provides it)

rebased onto f209365

5 years ago

sorry for not reacting on this. I have now merged a newer (similar) PR and am closing this one.

Pull-Request has been closed by slankes

5 years ago
Metadata