From 71a6283bbade4ed7115f3c9f0fa1c56780e417e6540ef27146d70ed98fe92613 Mon Sep 17 00:00:00 2001
From: OBS User mrdocs <null@suse.de>
Date: Fri, 1 Jun 2018 15:19:15 +0000
Subject: [PATCH] Accepting request 613036 from home:jengelh:branches:KDE:Extra

- Trim marketing filler wording from description.
- Replace duplicate -fno-strict-aliasing.
- Run fdupes over more files. (Do it with hardlinks;
  symlinks upset the documentation system.)

OBS-URL: https://build.opensuse.org/request/show/613036
OBS-URL: https://build.opensuse.org/package/show/KDE:Extra/scribus?expand=0&rev=38
---
 scribus.changes |  8 ++++++++
 scribus.spec    | 37 +++++++++++++++----------------------
 2 files changed, 23 insertions(+), 22 deletions(-)

diff --git a/scribus.changes b/scribus.changes
index 932f7a3..4e9f2e8 100644
--- a/scribus.changes
+++ b/scribus.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Wed May 30 08:03:23 UTC 2018 - jengelh@inai.de
+
+- Trim marketing filler wording from description.
+- Replace duplicate -fno-strict-aliasing.
+- Run fdupes over more files. (Do it with hardlinks;
+  symlinks upset the documentation system.)
+
 -------------------------------------------------------------------
 Tue May  1 21:29:52 UTC 2018 - wbauer@tmo.at
 
diff --git a/scribus.spec b/scribus.spec
index 1270fe1..7af04e7 100644
--- a/scribus.spec
+++ b/scribus.spec
@@ -20,8 +20,8 @@
 Name:           scribus
 Version:        1.4.7
 Release:        0
-Summary:        Open Source Page Layout and Desktop Publishing (DTP)
-License:        GPL-2.0+
+Summary:        Page Layout and Desktop Publishing (DTP)
+License:        GPL-2.0-or-later
 Group:          Productivity/Publishing/Other
 Url:            http://www.scribus.net/
 Source0:        http://sourceforge.net/projects/%{name}/files/%{name}/%{version}/%{name}-%{version}.tar.xz
@@ -58,8 +58,7 @@ BuildRequires:  python-devel
 BuildRequires:  shared-mime-info
 BuildRequires:  update-desktop-files
 
-
-%if 0%{?suse_version} 
+%if 0%{?suse_version}
 Requires:       ghostscript-library
 Requires:       python-imaging
 Requires:       tk
@@ -67,20 +66,16 @@ Suggests:       AdobeICCProfiles
 Suggests:       Uniconvertor
 %endif
 
-
 %description
-Scribus is a open source page layout program which
-produces commercial grade output in PDF and Postscript, primarily,
-though not exclusively, for Linux.
+Scribus is a page layout program which produces output in PDF and
+Postscript.
 
-While the goals of the program are ease of use and simple
-easy-to-understand tools, Scribus support for professional
-publishing features, such as CMYK and spot colors, easy PDF creation,
-Encapsulated Postscript import and export and creation of color
-separations.
+Scribus supports publishing features such as CMYK and spot colors,
+PDF creation, Encapsulated Postscript import and export and creation
+of color separations.
 
 %package devel
-Summary:        Open Source Page Layout / Desktop Publishing (DTP)
+Summary:        Development files for Scribus
 Group:          Development/Libraries/Other
 Requires:       %{name} = %{version}
 Requires:       freetype2-devel
@@ -89,9 +84,8 @@ Requires:       libstdc++-devel
 Requires:       zlib-devel
 
 %description devel
-
-This package provides the development headers for scribus. It is most useful 
-for developing scribus plugins.
+This package provides the development headers for Scribus, used for
+developing Scribus plugins.
 
 %prep
 
@@ -107,7 +101,7 @@ rm resources/swatches/*.eps
 rm resources/swatches/dtp-studio-free-palettes-license.rtf
 
 export CXXFLAGS="%{optflags} -fno-strict-aliasing"
-export CFLAGS="$CXXFLAGS -fno-strict-aliasing"
+export CFLAGS="$CXXFLAGS"
 
 mkdir build
 pushd build
@@ -127,8 +121,7 @@ make %{_smp_mflags}
 %install
 
 pushd build
-make install DESTDIR=%{buildroot}
-
+%make_install
 popd
 
 # install hi-res icons for better appearance on gnome-shell
@@ -143,7 +136,7 @@ install -D -m 0644 %{S:5} %{buildroot}%{_datadir}/icons/hicolor/256x256/apps/%{n
 
 %endif
 
-%fdupes -s %{buildroot}%{_includedir}/%{name}/
+%fdupes %{buildroot}/%{_prefix}
 
 # INSTALL APPSTREAM METAINFO (SOURCE6)
 install -Dm0644 %{S:6} %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml
@@ -172,7 +165,7 @@ install -Dm0644 %{S:6} %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml
 %{_datadir}/applications/%{name}.desktop
 # This should be owned by filesystem or man, but there are only scribus files:
 %lang(pl) %dir %{_mandir}/pl
-%lang(pl) %{_mandir}/pl/man1 
+%lang(pl) %{_mandir}/pl/man1
 %{_datadir}/icons/hicolor/*/apps/%{name}.png
 %dir %{_datadir}/appdata
 %{_datadir}/appdata/%{name}.appdata.xml