From 753b7cc491aab59aa3ae0156f664c7fa0b62ada1 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Nov 03 2016 06:16:18 +0000 Subject: import gwenview-4.10.5-4.el7 --- diff --git a/SOURCES/gwenview-fix-documentation-about-importer.patch b/SOURCES/gwenview-fix-documentation-about-importer.patch new file mode 100644 index 0000000..a9947e6 --- /dev/null +++ b/SOURCES/gwenview-fix-documentation-about-importer.patch @@ -0,0 +1,35 @@ +diff --git a/doc/index.docbook b/doc/index.docbook +index 175930c..1c3ee6b 100644 +--- a/doc/index.docbook ++++ b/doc/index.docbook +@@ -390,9 +390,7 @@ in the &kde; Device Notifier after connecting a supported device. + + + +- +- +- ++ + Importing Images + If you wish, you may select the images you want to import under + Select the documents to import by pressing the + +@@ -403,9 +401,9 @@ button to the right of the text box. When you are done, click the + Import Selected button to import only the images you have + selected, or click Import All to import all images found + on the device. +- ++ + +- ++ + Automatic Renaming + &kappname; Importer can rename your files according to a specified pattern. + To configure this, select the Settings in the lower left +@@ -414,6 +412,7 @@ corner. You may turn this feature on or off using the checkbox at the top. The + be replaced by metadata such as the date the image was created or its filename. + They are listed below the text box. You may either click on the parameter name to + enter it into the text box or type one manually. ++ + + + diff --git a/SPECS/gwenview.spec b/SPECS/gwenview.spec index de6052a..9595f15 100644 --- a/SPECS/gwenview.spec +++ b/SPECS/gwenview.spec @@ -1,7 +1,7 @@ Name: gwenview Summary: An image viewer Version: 4.10.5 -Release: 3%{?dist} +Release: 4%{?dist} # app: GPLv2+ # lib: IJG and (LGPLv2 or LGPLv3 or LGPLv3+ (KDE e.V.)) and LGPLv2+ and GPLv2+ @@ -15,6 +15,8 @@ URL: https://projects.kde.org/projects/kde/kdegraphics/gwenview %endif Source0: http://download.kde.org/%{stable}/%{version}/src/%{name}-%{version}.tar.xz +Patch0: gwenview-fix-documentation-about-importer.patch + BuildRequires: desktop-file-utils BuildRequires: kactivities-devel >= %{version} # libkonq @@ -27,7 +29,7 @@ BuildRequires: pkgconfig(lcms2) BuildRequires: pkgconfig(libpng) Requires: %{name}-libs%{?_isa} = %{version}-%{release} -Requires: kde-runtime%{?_kde4_version: >= %{_kde4_version}} +Requires: kde-runtime >= 4.10.5 # when split occurred Conflicts: kdegraphics < 7:4.6.95-10 @@ -47,6 +49,7 @@ Requires: %{name} = %{version}-%{release} %prep %setup -q +%patch0 -p1 -b .fix-documentation-about-importer.patch %build mkdir -p %{_target_platform} @@ -106,6 +109,10 @@ fi %changelog +* Tue Mar 29 2016 Jan Grulich - 4.10.5-4 +- Fix documentation about importer + Resolves: bz#1064200 + * Fri Jan 24 2014 Daniel Mach - 4.10.5-3 - Mass rebuild 2014-01-24