From 68b39195c4d228d108d9c3197dc790a3cb7c4391dce28805a30179992ce9fd06 Mon Sep 17 00:00:00 2001 From: OBS User mrdocs Date: Sun, 18 Mar 2012 02:58:53 +0000 Subject: [PATCH] Accepting request 109851 from home:jengelh:branches:M17N - Remove redundant tags/sections from specfile - Enable parallel build with %_smp_mflags OBS-URL: https://build.opensuse.org/request/show/109851 OBS-URL: https://build.opensuse.org/package/show/M17N/groff?expand=0&rev=32 --- groff.changes | 6 ++++++ groff.spec | 27 +++++++++------------------ gxditview.changes | 6 ++++++ gxditview.spec | 19 ++++++------------- 4 files changed, 27 insertions(+), 31 deletions(-) diff --git a/groff.changes b/groff.changes index 239dfa9..b0be64a 100644 --- a/groff.changes +++ b/groff.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Mar 18 00:14:49 UTC 2012 - jengelh@medozas.de + +- Remove redundant tags/sections from specfile +- Enable parallel build with %_smp_mflags + ------------------------------------------------------------------- Thu Sep 29 12:49:28 UTC 2011 - adrian@suse.de diff --git a/groff.spec b/groff.spec index bef2a01..ee257d7 100644 --- a/groff.spec +++ b/groff.spec @@ -1,7 +1,7 @@ # # spec file for package groff # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -14,16 +14,12 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - -# norootforbuild - - Name: groff +Version: 1.21 +Release: 0 +Summary: GNU troff Document Formatting System License: BSD-3-Clause ; GPL-2.0+ Group: Productivity/Publishing/Troff -Version: 1.21 -Release: 1 -Summary: GNU troff Document Formatting System Url: http://www.gnu.org/software/groff/groff.html Source0: ftp://ftp.gnu.org/gnu/groff/groff-%{version}.tar.gz Source3: zzz-groff.sh @@ -51,15 +47,14 @@ Patch9: 0002-documentation-for-the-locale-keyword.patch Patch10: groff-force-locale-usage.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: gcc-c++ BuildRequires: bison BuildRequires: fdupes +BuildRequires: gcc-c++ Provides: normal-groff = %{version}-%{release} Provides: jgroff = %{version}-%{release} Obsoletes: jgroff < %{version} Requires(pre): %fillup_prereq Requires(pre): %install_info_prereq -AutoReqProv: on # for pre-grohtml and pdfroff Recommends: netpbm Recommends: ghostscript-library @@ -76,9 +71,8 @@ programs store their man pages in either /usr/share/man/ or /usr/X11R6/man/. %package doc -License: BSD-3-Clause ; GPL-2.0+ -Group: Productivity/Publishing/Troff Summary: HTML documentation and examples for groff +Group: Productivity/Publishing/Troff %description doc The groff package provides compatible versions of troff, nroff, eqn, @@ -91,7 +85,7 @@ programs store their man pages in either /usr/share/man/ or /usr/X11R6/man/. %prep -%setup -q -n groff-%{version} +%setup -q %patch0 -p1 -b .debian %patch1 %patch2 -p1 -b .bnc540600 @@ -118,9 +112,9 @@ export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" %{configure} ulimit -c unlimited -%{__make} +make %{?_smp_mflags} pushd doc - %{__make} + make %{?_smp_mflags} makeinfo groff.texinfo popd @@ -143,9 +137,6 @@ popd %fdupes -s %{buildroot} -%clean -rm -rf %{buildroot} - %post %install_info --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz diff --git a/gxditview.changes b/gxditview.changes index eb14f11..afe6cac 100644 --- a/gxditview.changes +++ b/gxditview.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Sun Mar 18 00:14:49 UTC 2012 - jengelh@medozas.de + +- Remove redundant tags/sections from specfile +- Enable parallel build with %_smp_mflags + ------------------------------------------------------------------- Sun Feb 19 18:22:20 UTC 2012 - coolo@suse.com diff --git a/gxditview.spec b/gxditview.spec index c248fe3..9d4c806 100644 --- a/gxditview.spec +++ b/gxditview.spec @@ -1,7 +1,7 @@ # # spec file for package gxditview # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -14,16 +14,12 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # - - - Name: gxditview +Version: 1.21 +Release: 0 +Summary: Ditroff Output Displayer for Groff License: MIT Group: Productivity/Publishing/Troff -AutoReqProv: on -Version: 1.21 -Release: 1 -Summary: Ditroff Output Displayer for Groff Url: http://www.gnu.org/software/groff/groff.html Source0: ftp://ftp.gnu.org/gnu/groff/groff-%{version}.tar.gz # for file in `cat series | grep -v '^#' | grep '^[a-z]' `; do @@ -52,9 +48,9 @@ used by the groff command. gxditview is used by groff if called with the -X option. %package -n groff-devx +Summary: X output devices for groff License: BSD-3-Clause ; GPL-2.0+ Group: Productivity/Publishing/Troff -Summary: X output devices for groff Requires: groff Supplements: groff @@ -81,7 +77,7 @@ export PATH GROFF_COMMAND_PREFIX GROFF_FONT_PATH GROFF_TMAC_PATH # export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" INSTALL_PROGRAM='${INSTALL}' %{configure} -%{__make} +make %{?_smp_mflags} %install @@ -101,9 +97,6 @@ pushd src/devices/xditview/ %{__install} -m 0644 %{name}.man %{buildroot}%{_mandir}/man1/%{name}.1 popd -%clean -%{__rm} -rf %{buildroot} - %files %defattr(-,root,root) %doc src/devices/xditview/ChangeLog