From 04674f11fb18f5a39419e2662510367066ab4da8103a508c325361434e73ccd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= Date: Thu, 3 Jan 2019 12:55:24 +0000 Subject: [PATCH] - Switch to multibuild in order to avoid having to manage 2 differentiating spec files OBS-URL: https://build.opensuse.org/package/show/M17N/groff?expand=0&rev=66 --- _multibuild | 4 + groff-full.changes | 848 ---------------------------- groff-full.spec | 382 ------------- groff.changes | 6 + groff-full.keyring => groff.keyring | 0 groff.spec | 52 +- pre_checkin.sh | 6 - 7 files changed, 36 insertions(+), 1262 deletions(-) create mode 100644 _multibuild delete mode 100644 groff-full.changes delete mode 100644 groff-full.spec rename groff-full.keyring => groff.keyring (100%) delete mode 100644 pre_checkin.sh diff --git a/_multibuild b/_multibuild new file mode 100644 index 0000000..9a7aa78 --- /dev/null +++ b/_multibuild @@ -0,0 +1,4 @@ + + full + + diff --git a/groff-full.changes b/groff-full.changes deleted file mode 100644 index 6316942..0000000 --- a/groff-full.changes +++ /dev/null @@ -1,848 +0,0 @@ -------------------------------------------------------------------- -Wed Oct 30 23:50:14 UTC 2018 - Bernhard Wiedemann - -- add groff-reproducible-mdate.patch and groff-use-SDE.patch to allow - to override build time to make package build reproducible (boo#1047218) - -------------------------------------------------------------------- -Mon Mar 19 11:47:37 CET 2018 - kukuk@suse.de - -- Use %license instead of %doc [bsc#1082318] - -------------------------------------------------------------------- -Mon Dec 18 10:38:07 UTC 2017 - tchvatal@suse.com - -- Set the license to GPL-3.0+ as per COPYING - -------------------------------------------------------------------- -Thu Dec 14 18:47:28 UTC 2017 - crrodriguez@opensuse.org - -- Replace xorg-x11-devel buildrequires by the needed individual - libraries - -------------------------------------------------------------------- -Thu Jul 21 11:12:50 UTC 2016 - tchvatal@suse.com - -- Add patch for bnc#989903 and move all scripts from libdir to - libexecdir - -------------------------------------------------------------------- -Wed Feb 4 10:30:49 UTC 2015 - tchvatal@suse.com - -- Version bump to latest release 1.22.3: - * X11 resources for `gxditview', which were previously installed in - /usr/X11/lib/X11/app-defaults no matter which `prefix' was set, are - now installed in appresdir=$prefix/lib/X11/app-defaults. If - `appresdir' is not a standard X11 resource directory, the environment - variable XFILESEARCHPATH should be set to this path. The standard - default directories depends on the system `libXt'. - * This new preprocessor (contributed by Bernd Warken) allows embedding of - code for GNU LilyPond (http://www.lilypond.org), a music typesetter. The - data gets automatically processed and embedded as EPS images. - * Bernd Warken contributed a new preprocessor to handle Perl code that can - be evaluated and then processed by groff. - * Another preprocessor from Bernd Warken to pretty-print Pinyin syllables - like `guo2wang2' as `guówáng'. - * The pdfroff utility script now activates its `--no-toc-relocation' option - by default, unless a request similar to: - .if !\n[PHASE] .tm pdfroff-option:set toc_relocation=enabled - is invoked during input file processing; (`.if !\n[PHASE] ...' ensures - that the effect of the `.tm' request is restricted to the document setup - phase of processing, as pdfroff sets it to 1 or 2 in the output phase, - but leaves it unset in the setup phase). - The bundled `spdf.tmac' macro package, which implicitly activates - `-mpdfmark' for `ms' macro users, ensures that TOC relocation is - appropriately enabled, when the `.TC' macro is invoked. - * The -mom macro package now has full support for eqn, pic, and tbl, as well - as captioning and labelling of pdf images and preprocessor output. Lists - of Figures, Equations, and Tables can now be autogenerated. PDF_IMAGE has - a new FRAME option. - * A French introduction to the -me macro package has been added (file - `meintro_fr.me'). - * In -mdoc, command %C is now available, providing a city or place - reference. -- Refreshed patches: - * groff-1.21-CVE-2009-5081.patch - * groff-1.21-groffer-libexecdir.patch - * groff-force-locale-usage.patch -- Replaced patches: - * deleted groff_1.22.2-2.debian.diff - * added groff_1.22.3-1.debian.diff -- New patches: - * groff-multi-thread.patch - -------------------------------------------------------------------- -Sat Dec 20 14:34:44 UTC 2014 - meissner@suse.com - -- build with PIE - -------------------------------------------------------------------- -Tue Jun 25 06:38:16 UTC 2013 - mvyskocil@suse.com - -- move man.local and mdoc.local from groff-full to groff - * fixes libssh2.org testsuite - -------------------------------------------------------------------- -Mon Jun 17 11:18:11 UTC 2013 - werner@suse.de - -- Take care of mmroff.1.gz as well as of mmroff perl script - -------------------------------------------------------------------- -Mon Jun 17 10:18:59 UTC 2013 - werner@suse.de - -- Move important non-graphical macros from groff-full back to groff - as otherwise many packages do not build anymore - -------------------------------------------------------------------- -Wed Jun 5 09:00:09 UTC 2013 - mvyskocil@suse.com - -- modify groff_1.22.2-2.debian.diff - remove the part related to - src/preproc/html/pre-html.cpp, fixes bnc#755533 - -------------------------------------------------------------------- -Thu May 9 09:16:49 UTC 2013 - mvyskocil@suse.com - -- update to groff 1.22.2 - * gropdf: A new driver for generating PDF output directly, - contributed by Deri James and written in Perl - * The -mom macro package has reached version 2.0, focusing on - PDF output with gropdf (using the new `pdfmom' wrapper script). - See the file`version-2.html' of the -mom documentation for a list - of the many changes. - * pdfmom: A new wrapper around groff that facilitates the production of PDF - documents from files formatted with the -mom macros. - * and a lot more, see NEWS for details -- obsoletes: - config-guess-sub-update.patch, dtto - groff_1.21-6.debian.diff, replaced by -- added groff_1.22.2-2.debian.diff -- create a stripped-down version of groff usable for viewing of manual pages -- new groff-full package contains the rest of groff tools capable to work with - images, html or pdf. It contains the devx fonts, thus obsoletes groff-devx - it aims to fix bnc#755533 - grohtml built without pnm* tools in PATH -- gxdview.spec is removed as gxdview is built from groff-full.spec -- verify the tarball using gpg-offline - this is done in groff-full only - to retain a limited list of dependencies for base groff - -------------------------------------------------------------------- -Tue May 7 14:40:06 UTC 2013 - schwab@suse.de - -- config-guess-sub-update.patch: Update config.guess/sub for aarch64 - -------------------------------------------------------------------- -Mon Feb 4 14:33:41 UTC 2013 - coolo@suse.com - -- update license to new format - -------------------------------------------------------------------- -Fri Sep 7 13:02:36 UTC 2012 - coolo@suse.com - -- add explicit buildrequire makeinfo - -------------------------------------------------------------------- -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 - -- use RPM_OPT_FLAGS for compile - -------------------------------------------------------------------- -Thu Sep 29 08:09:33 UTC 2011 - mvyskocil@suse.cz - -- implemented FATE#312586 - Add locales support for groff papersize - * the default papersize is now determined from system locale (LC_PAPER) - * /etc/papersize is no longer owned by the groff package - -------------------------------------------------------------------- -Thu Sep 22 12:50:27 UTC 2011 - mvyskocil@suse.cz - -- fix bnc#703665 - VUL-1: groff: missing checks for mktemp failures - (CVE-2009-5080) -- fix bnc#703666 - VUL-1: groff: insufficient number of X for mktemp - (CVE-2009-5081) - -------------------------------------------------------------------- -Mon Jun 27 11:14:25 UTC 2011 - mvyskocil@suse.cz - -- update to 1.21 a bugfix release - * use new groff_1.21-6.debian.diff - * refresh libexecdir and pdfroff patch -- fix FATE#311297: Get rid of SuSEconfig.groff - * removed - -------------------------------------------------------------------- -Wed Jun 8 09:06:44 UTC 2011 - mvyskocil@suse.cz - -- fix bnc#698290: insecure temporary file handling in pdfroff - * groff-1.20.1-CVE-2009-5044.patch -- fix bnc#683857: Unicode characters in use properly - * change the soft hyphenation char to - in tty.tmac - -------------------------------------------------------------------- -Mon Jun 6 10:10:08 UTC 2011 - mvyskocil@suse.cz - -- -- fix bnc#682913: device X100 is missing - * create new groff-devx package containing all devX devices, as they - need X for build -- fix bnc#683857: Unicode characters in use - * groff-1.20.1-deunicode.patch adds deunicode.tmac to tty.tmac removes - all unecessary unicode characters in tty output - -------------------------------------------------------------------- -Tue Mar 15 08:34:56 UTC 2011 - mvyskocil@suse.cz - -- fix bnc#679585 - groff.info is not installed - * install info files as %{name}.info.gz - -------------------------------------------------------------------- -Thu Oct 7 09:33:18 UTC 2010 - mvyskocil@suse.cz - -- fix bnc#644467: SuSEconfig.groff overwrites /etc/papersize - use the check_md5_and_move to prevent it -- deprecation warning for GROFF* variables in /etc/sysconfig/suseconfig - -------------------------------------------------------------------- -Tue Oct 5 12:25:28 UTC 2010 - mvyskocil@suse.cz - -- fix bnc#633128: Update groff to 1.20.1 - this update obsoletes a big number of SUSE patches - * groff_1.18.1.1-1-debian.diff.bz2 - adds Japanese support, which is now - upstreamed. However new groff_1.20.1-10.debian.diff has been added - * suse.patch - not needed - * pic-html.patch - probably not needed - * gcc4.patch - already fixed by upstream - * groff-1.17.2-gcc3.patch - seems not needed - * utf8.patch - http://www.mail-archive.com/groff@gnu.org/msg05273.html says - iconv hack is no longer needed, new version uses preconv - * debian-fix.patch - already fixed by upstream - * double-free.patch - already fixed by upstream - * groffer-security.patch - in debian diff - * groff-1.18.1.1-gcc41.patch - already fixed by upstream - * bugzilla-217106-too-few-arguments-in-function-call.patch - makes sense - only with ENABLE_MULTIBYTE, which was added by old debian diff - * bugzilla-292412-special-encoding-handling-also-for-chinese.patch - seems not necessary - * gcc43.patch - already fixed by upstream - * fgets-overflow.patch - already fixed by upstream - * bnc446710.patch - seems not needed anymore - * groff-1.18.1.1-debian-538330.patch - part of debian diff -- fix bnc#643083 - groff: default /etc/papersize should be "a4" - no "papersize a4" without SuSEconfig anymore -- move docs and examples to groff-docs subpackage - -------------------------------------------------------------------- -Wed Oct 14 13:48:20 UTC 2009 - mvyskocil@suse.cz - -- fixed bnc#529557 - groff: insecure file handling - -------------------------------------------------------------------- -Mon Sep 21 11:11:05 CEST 2009 - tiwai@suse.de - -- fix broken output of man page when $LANGUAGE is set empty - (bnc#540600) - -------------------------------------------------------------------- -Mon Feb 02 18:47:32 CET 2009 - mfabian@suse.de - -- bnc#470921: add more workarounds for Korean to fix the truncation - of some non-Korean man-pages in ko_KR.UTF-8 locale. - -------------------------------------------------------------------- -Mon Dec 22 15:18:31 CET 2008 - mls@suse.de - -- keep zzz-groff.csh from aborting if LANG is unset - -------------------------------------------------------------------- -Tue Nov 25 15:15:44 CET 2008 - mfabian@suse.de - -- bnc#448185: improve workaround for bnc#446710. After the - tmandocdb workaround was removed from "man", the new - workaround in groff failed in some locales. - -------------------------------------------------------------------- -Fri Nov 21 15:54:34 CET 2008 - mfabian@suse.de - -- bnc#401952: Add a workaround to /usr/bin/nroff to make Korean - man-pages display correctly again. -- /etc/profile.d/groff.{sh,csh} moved to - /etc/profile.d/zzz-groff.{sh,csh} to be able to check for LANG. - Changes in these scripts: - • Don’t set GROFF_NO_SGR by default anymore, it causes problems - with Korean man pages. - • For CJK languages, set MAN_KEEP_FORMATTING by default. - Without MAN_KEEP_FORMATTING man will use GROFF_NO_SGR when - writing to a pipe or file and will also pipe the result - through "col -b -p -x". This doesn’t work well for CJK, at - least not with the current version of groff. - -------------------------------------------------------------------- -Thu Nov 20 17:48:24 CET 2008 - mfabian@suse.de - -- bnc#446710: add the workarounds from - /usr/share/groff/site-tmac/tmac.andocdb (man package) directly - to groff. These workarounds are to avoid rendering - as - U+2010 (HYPHEN), \- as U+2212 (MINUS SIGN), ` as U+2018 - (LEFT SINGLE QUOTATION MARK), and ' as U+2019 (RIGHT SINGLE - QUOTATION MARK). Using these non-ASCII characters for rendering - man-pages with programm examples and command line options is - confusing and prevents cut and paste of code examples - impossible. - -------------------------------------------------------------------- -Wed Oct 8 02:10:33 CEST 2008 - crrodriguez@suse.de - -- fix buffer overflow in ps.cc - -------------------------------------------------------------------- -Mon Oct 6 22:15:13 CEST 2008 - meissner@suse.de - -- fixed fgets overflow -- fixed some rpmlint issues - -------------------------------------------------------------------- -Mon Apr 21 17:25:52 CEST 2008 - mfabian@suse.de - -- bnc#381905: remove the hack in /usr/bin/nroff to convert - UTF-8 encoded man-pages back to the appropriate legacy encoding - because newer versions of “man” also do this conversion now - and doing the same conversion twice breaks it. - -------------------------------------------------------------------- -Tue Mar 25 13:11:08 CET 2008 - mfabian@suse.de - -- bnc#373284: fix wrong spelling of UTF-8 in iconv call used in - nroff.sh (Thanks to Bruno Haible for the fix). - -------------------------------------------------------------------- -Wed Nov 7 09:37:39 CET 2007 - meissner@suse.de - -- fixed gcc4.3 build - -------------------------------------------------------------------- -Tue Jul 24 11:51:08 CEST 2007 - mfabian@suse.de - -- Bugzilla #292412: make the hacks for Chinese less weird by - applying the patch from comment #31 by Peng Wu - and adapting the patch to /usr/bin/nroff. -- remove shebang from SuSEconfig.groff (is sourced, not executed). - -------------------------------------------------------------------- -Mon Jul 23 19:41:27 CEST 2007 - mfabian@suse.de - -- Bugzilla #292412: add some more hacks to /usr/bin/nroff to - support Chinese man pages as well. - -------------------------------------------------------------------- -Mon Mar 26 15:50:16 CEST 2007 - rguenther@suse.de - -- add bison BuildRequires. - -------------------------------------------------------------------- -Wed Jan 17 14:33:50 CET 2007 - mfabian@suse.de - -- Bugzilla #217106: too few arguments in function call. - -------------------------------------------------------------------- -Tue Jan 09 22:01:52 CET 2007 - mfabian@suse.de - -- do not build as root. -- make it build in the openSUSE build service. - -------------------------------------------------------------------- -Tue Jan 02 18:58:35 CET 2007 - mfabian@suse.de - -- Bugzilla #230030: make Russian and Czech man-pages display - correctly again in UTF-8 locales (has been broken by the - update to man-2.4.3). - -------------------------------------------------------------------- -Tue Sep 5 11:59:42 CEST 2006 - rguenther@suse.de - -- Split gxdview to a separate spec file. - -------------------------------------------------------------------- -Mon Sep 4 14:41:08 CEST 2006 - rguenther@suse.de - -- Remove unneeded build dependency on ghostscript-mini. - -------------------------------------------------------------------- -Sun Aug 6 15:19:35 CEST 2006 - cthiel@suse.de - -- fix build with X.org 7.1 - -------------------------------------------------------------------- -Tue Feb 28 18:12:58 CET 2006 - mfabian@suse.de - -- Bugzilla #148472: use -Tlatin1 instead of -Tascii8 for - languages which used ISO-8859-1 as legacy encoding. - With -Tascii8, "\(:u" for ü won't work. - -------------------------------------------------------------------- -Thu Feb 09 15:34:48 CET 2006 - mfabian@suse.de - -- Bugzilla #148922: nroff hangs when input comes from a file - and not from a pipe: Improfe UTF-8 workaround to handle this - case as well by parsing the options with getopt to find out - whether a file was given as an argument. - -------------------------------------------------------------------- -Fri Jan 27 01:40:24 CET 2006 - mls@suse.de - -- converted neededforbuild to BuildRequires - -------------------------------------------------------------------- -Thu Jan 26 15:51:26 CET 2006 - sbrabec@suse.cz - -- Added %install_info_prereq. - -------------------------------------------------------------------- -Mon Jan 23 18:31:45 CET 2006 - mfabian@suse.de - -- Bugzilla #144726: add workaround to allow UTF-8 encoded sources - of man-pages. Some packages already contain man-pages with - UTF-8 encoded man-page sources, for example "mc". Hopefully - one day groff will really support this. Until then a workaround - is better than nothing. - -------------------------------------------------------------------- -Fri Dec 9 15:04:53 CET 2005 - meissner@suse.de - -- -fno-strict-aliasing. - -------------------------------------------------------------------- -Thu Oct 13 10:11:33 CEST 2005 - meissner@suse.de - -- fixed build. - -------------------------------------------------------------------- -Sat Sep 17 21:14:11 CEST 2005 - meissner@suse.de - -- fixed implicits. - -------------------------------------------------------------------- -Mon Aug 22 12:37:18 CEST 2005 - mfabian@suse.de - -- Bugzilla #105807: /etc/papersize can be changed by SuSEconfig, - don't verify md5, size, mtime. - /usr/share/groff/1.18.1/tmac/mm/locale and - /usr/share/groff/1.18.1/tmac/mm/se_locale are empty by default, - don't verify md5. - -------------------------------------------------------------------- -Wed Jun 22 11:39:33 CEST 2005 - mfabian@suse.de - -- improve papersize detection in SuSEconfig.groff. - -------------------------------------------------------------------- -Thu Jun 02 15:01:11 CEST 2005 - mfabian@suse.de - -- add symbolic link for tetex (and others): - /usr/share/groff/%{version} -> /usr/share/groff/current - -------------------------------------------------------------------- -Mon Dec 06 22:13:15 CET 2004 - mfabian@suse.de - -- Bugzilla #47862: fix insecure creation of temporary directory - in groffer.sh, see also CAN-2004-0969. - -------------------------------------------------------------------- -Fri Sep 17 11:41:38 CEST 2004 - mfabian@suse.de - -- add gcc4 patch received from Andreas Jaeger. - -------------------------------------------------------------------- -Thu Sep 16 17:06:37 CEST 2004 - schwab@suse.de - -- Fix double free. - -------------------------------------------------------------------- -Tue Sep 7 12:37:19 CEST 2004 - mfabian@suse.de - -- Bugzilla #44115: add groff.{sh,csh} and set GROFF_NO_SGR to - disable the use of ANSI colour sequences by default. They don't - work well with many pagers (e.g. lv, (X)Emacs) and they cause - problems when searching in man-pages when using less as the - pager. - -------------------------------------------------------------------- -Tue Jun 29 19:23:18 CEST 2004 - mfabian@suse.de - -- update to 1.18.1.1 -- remove bison patch, voiddecl patch and patch to node.cc - (fixed upstream). - -------------------------------------------------------------------- -Mon Apr 19 14:57:21 CEST 2004 - mmj@suse.de - -- Declare void functions as such, and make int functions return such - -------------------------------------------------------------------- -Tue Aug 26 01:11:37 CEST 2003 - mfabian@suse.de - -- Bugzilla #28394: add workaround to display the euro symbol in - 'man iso-8859-15' correctly in UTF-8 locales. - -------------------------------------------------------------------- -Thu Aug 14 17:12:41 CEST 2003 - mfabian@suse.de - -- Bugzilla #28945: add missing activation metadata to - sysconfig template - -------------------------------------------------------------------- -Wed May 21 13:44:11 CEST 2003 - coolo@suse.de - -- making /etc/papersize noreplace (the chances are very small the - package knows the papersize better than the user) -- installing the info pages - -------------------------------------------------------------------- -Thu Mar 6 17:19:49 CET 2003 - ro@suse.de - -- readd ghostscript-mini to neededforbuild (fix docu) - -------------------------------------------------------------------- -Thu Mar 6 13:26:37 CET 2003 - mfabian@suse.de - -- Bug #24758: fix segfault on copying an empty bracket_node - was reproducible with echo ' \b"" ' | troff - -------------------------------------------------------------------- -Mon Jan 27 16:51:04 CET 2003 - mfabian@suse.de - -- Bug #22693: add missing metadata to sysconfig.suseconfig-groff - -------------------------------------------------------------------- -Mon Jan 20 19:50:43 CET 2003 - mfabian@suse.de - -- fix file list to include /usr/share/man{5,7}/* -- extend workaround for non-latin1 man-page sources in UTF-8 - locales to Hungarian, Croatian, Polish, and Russian - -------------------------------------------------------------------- -Fri Dec 6 23:11:19 CET 2002 - olh@suse.de - -- remove ghostscript-mini-packages to build groff anyway - -------------------------------------------------------------------- -Wed Nov 20 17:11:35 CET 2002 - ro@suse.de - -- use ghostscript-mini-packages - -------------------------------------------------------------------- -Wed Nov 13 08:40:10 CET 2002 - ro@suse.de - -- fix build with current bison (end all rules with ";") - -------------------------------------------------------------------- -Sun Oct 13 19:30:45 CEST 2002 - mfabian@suse.de - -- remove bogus "Requires: bc". - -------------------------------------------------------------------- -Wed Aug 28 14:48:04 CEST 2002 - mfabian@suse.de - -- fix display of Czech man pages in cs_CZ.UTF-8 locale - -------------------------------------------------------------------- -Thu Aug 1 14:09:54 CEST 2002 - mfabian@suse.de - -- add %fillup_prereq to Prereq: - -------------------------------------------------------------------- -Tue Jun 4 20:06:46 CEST 2002 - mfabian@suse.de - -- fix typo - -------------------------------------------------------------------- -Tue Jun 4 18:22:29 CEST 2002 - mfabian@suse.de - -- fix display of Japanese man pages in ja_JP.UTF-8 locale - -------------------------------------------------------------------- -Thu May 2 14:02:51 CEST 2002 - meissner@suse.de - -- Fixed g++ 3 issue (do not link C++ libraries with gcc) - -------------------------------------------------------------------- -Sun Apr 7 17:42:44 CEST 2002 - schwab@suse.de - -- Fix for new autoconf. - -------------------------------------------------------------------- -Tue Mar 19 00:11:05 CET 2002 - mfabian@suse.de - -- fix bug #15052: add 'libgimpprint glib glib-devel' to - '# neededforbuild' because 'gs' needs this to run. When 'gs' - doesn't run, some .png pictures in the 'doc' directory - can't be created and remain empty. -- add groff-1.17.2-pic-html.diff to avoid using the process ID - in the names of the created .png files. - -------------------------------------------------------------------- -Sun Mar 10 15:56:25 CET 2002 - mfabian@suse.de - -- write just 'a4' or 'letter' into /etc/papersize, not - 'papersize a4' or 'papersize letter'. All this papersize - stuff doesn't seem to matter much anyway as groff calls - grops with the '-g' option (guess page length). - -------------------------------------------------------------------- -Sat Mar 9 14:25:36 CET 2002 - ro@suse.de - -- replaced plp by lprng in neededforbuild - -------------------------------------------------------------------- -Fri Mar 1 13:43:08 CET 2002 - mfabian@suse.de - -- fix /sbin/conf.d/SuSEconfig.groff: - prefer paper size information from the locale, use GROFF_PAGESIZE - as an override. - -------------------------------------------------------------------- -Fri Feb 1 00:26:07 CET 2002 - ro@suse.de - -- changed neededforbuild to - -------------------------------------------------------------------- -Wed Jan 16 16:01:50 CET 2002 - ro@suse.de - -- moved variables to sysconfig/suseconfig - -------------------------------------------------------------------- -Thu Jan 10 14:59:01 CET 2002 - mfabian@suse.de - -- move *GROFF* variables from /etc/rc.config to - /etc/sysconfig/groff (fix Bug #12739) - -------------------------------------------------------------------- -Mon Oct 15 16:20:23 CEST 2001 - mfabian@suse.de - -- add /etc/papersize (fix Bug #11810) - -------------------------------------------------------------------- -Mon Sep 3 13:37:56 CEST 2001 - mfabian@suse.de - -- add obsoletes jgroff - -------------------------------------------------------------------- -Thu Aug 30 11:41:16 CEST 2001 - mfabian@suse.de - -- upgrade debian patch to groff_1.17.2-7.diff - (fixes the problem with bold utf-8 characters, i.e. obsoletes - groff_1.17.2-6.1-debian-fix-minus.diff and includes a fix - for the troff man-page) - -------------------------------------------------------------------- -Tue Aug 21 18:48:29 CEST 2001 - mfabian@suse.de - -- upgrade debian patch to groff_1.17.2-6.1.diff - (fix hyphen character problem in EUC-JP encoding, - Fumitoshi UKAI Fri, 17 Aug 2001) -- fix problem with bold minus characters in utf-8 caused by - debian patch (thanks to ) - -------------------------------------------------------------------- -Fri Aug 17 12:11:48 CEST 2001 - mfabian@suse.de - -- include patch for Japanese support from Debian -- security fix from Sebastian Krahmer seems - to be included upstream, removed. - -------------------------------------------------------------------- -Fri Jul 20 12:06:42 CEST 2001 - kukuk@suse.de - -- changed neededforbuild to -- changed neededforbuild to -- changed neededforbuild to - -------------------------------------------------------------------- -Thu Jul 12 12:33:45 CEST 2001 - fehr@suse.de - -- update to version 1.17.2 - -------------------------------------------------------------------- -Fri Jul 6 11:22:27 CEST 2001 - fehr@suse.de - -- add security fix from Sebastian Krahmer - -------------------------------------------------------------------- -Mon Jun 25 12:48:25 CEST 2001 - fehr@suse.de - -- update to version 1.17.1 - -------------------------------------------------------------------- -Tue Jun 12 12:01:43 CEST 2001 - fehr@suse.de - -- make it build with newer compilers (ia64, axp) - -------------------------------------------------------------------- -Tue May 22 18:40:53 CEST 2001 - fehr@suse.de - -- update to version 1.17 - -------------------------------------------------------------------- -Mon May 7 12:39:47 CEST 2001 - mfabian@suse.de - -- bzip2 source - -------------------------------------------------------------------- -Sat Apr 21 21:25:32 CEST 2001 - schwab@suse.de - -- Fix C++ constraint violation. - -------------------------------------------------------------------- -Wed Mar 7 16:23:29 CET 2001 - uli@suse.de - -- added xf86 to neededforbuild - -------------------------------------------------------------------- -Wed Dec 13 10:16:37 CET 2000 - mfabian@suse.de - -- added "Provides: normal-groff". This enables the japanized - groff to use "Provides: groff" and "Conflicts: normal-groff". - -------------------------------------------------------------------- -Fri Dec 8 11:03:15 MET 2000 - fehr@suse.de - -- add conflicts to jgroff - -------------------------------------------------------------------- -Tue Sep 5 16:24:15 MEST 2000 - fehr@suse.de - -- check for writable fontdir in SuSEconfig.groff (#2787) - -------------------------------------------------------------------- -Tue Aug 15 10:26:06 CEST 2000 - mfabian@suse.de - -- update to version 1.16.1 -- added 'BuildRoot' - -------------------------------------------------------------------- -Fri Aug 4 10:11:08 MEST 2000 - fehr@suse.de - -- changes to new version 1.16.1 of groff - -------------------------------------------------------------------- -Fri Jul 21 16:47:13 MEST 2000 - fehr@suse.de - -- add patch to display japanese man pages again - -------------------------------------------------------------------- -Fri Jul 7 16:23:40 MEST 2000 - fehr@suse.de - -- change comment in rc.config part of package (bugzilla #3256) - -------------------------------------------------------------------- -Mon May 29 13:21:03 MEST 2000 - fehr@suse.de - -- changes to new version 1.16 of groff - -------------------------------------------------------------------- -Fri May 19 14:13:18 MEST 2000 - fehr@suse.de - -- move documentation to /usr/share/doc/packages - -------------------------------------------------------------------- -Thu Mar 16 21:32:54 MET 2000 - werner@suse.de - -- nroff script - * Allow other ISO latin character sets because they use the same - 8 bit table: use -Tlatin1 - * Allow wide ANSI character maps (e.g. Japanese) because they use - multiple 8 bit characters: use -Tlatin1 - * Map -Tnippon to -Tlatin1 - -------------------------------------------------------------------- -Mon Mar 6 15:50:30 CET 2000 - schwab@suse.de - -- Update tmac.m from CVS. -- Fix tmac.mse reference to tmac.m. - -------------------------------------------------------------------- -Fri Feb 25 16:37:03 CET 2000 - schwab@suse.de - -- /usr/man -> /usr/share/man - -------------------------------------------------------------------- -Mon Jan 3 10:39:24 CET 2000 - schwab@suse.de - -- Update to 1.15 (Y2K fix). -- Get rid of Makefile.Linux. - -------------------------------------------------------------------- -Mon Sep 27 16:31:01 CEST 1999 - bs@suse.de - -- fixed requirements for sub packages - -------------------------------------------------------------------- -Mon Sep 13 17:23:57 CEST 1999 - bs@suse.de - -- ran old prepare_spec on spec file to switch to new prepare_spec. - -------------------------------------------------------------------- -Fri Jul 2 19:14:18 CEST 1999 - werner@suse.de - -- Fix Makefle.Linux to make (g)xditview with the values - set in Imakefile -- Split up a new package gxdview to avoid dependencies - of groff on the X11 system. -- Correct version number of groff in pac - -------------------------------------------------------------------- -Tue Feb 23 08:15:50 MET 1999 - ro@suse.de - -- don't redclare strchr for glibc - -------------------------------------------------------------------- -Tue Dec 15 00:38:04 MET 1998 - bs@suse.de - -- fixed SuSEconfig - -------------------------------------------------------------------- -Sun Dec 13 22:48:48 MET 1998 - bs@suse.de - -- made SuSEconfig.groff a little bit more silent. - -------------------------------------------------------------------- -Wed Nov 18 14:34:32 MET 1998 - ro@suse.de - -- commented out "find" in specfile - -------------------------------------------------------------------- -Tue Nov 17 14:54:13 MET 1998 - werner@suse.de - -- Remove hint during SuSEconfig.groff - -------------------------------------------------------------------- -Thu Sep 3 17:50:05 MET DST 1998 - werner@suse.de - -- Add three missed files - -------------------------------------------------------------------- -Tue Aug 25 16:36:47 MEST 1998 - werner@suse.de - -- Skipt warn message if printer isn't configured - -------------------------------------------------------------------- -Thu Aug 6 16:24:02 MEST 1998 - werner@suse.de - -- New version 1.11a -- Make docs and install them -- Add a auto configure script for SuSEconfig -- Make tmac/tmac.safer more safer: do not open files via .so - -------------------------------------------------------------------- -Sun Jul 26 19:50:30 MEST 1998 - bs@suse.de - -- fixed name of GXDITVIEW - ----------------------------------------------------------------------------- -Tue Oct 7 11:00:38 CEST 1997 - florian@suse.de - -- prepared spec file -- "bash 2.0" Fix in Makefile - diff --git a/groff-full.spec b/groff-full.spec deleted file mode 100644 index 77aad49..0000000 --- a/groff-full.spec +++ /dev/null @@ -1,382 +0,0 @@ -# -# spec file for package groff-full -# -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. -# -# All modifications and additions to the file contributed by third parties -# remain the property of their copyright owners, unless otherwise agreed -# upon. The license for this file, and modifications and additions to the -# file, is the same license as for the pristine package itself (unless the -# license for the pristine package is not an Open Source License, in which -# case the license is the MIT License). An "Open Source License" is a -# license that conforms to the Open Source Definition (Version 1.9) -# published by the Open Source Initiative. - -# Please submit bugfixes or comments via http://bugs.opensuse.org/ -# - - -##### WARNING: please do not edit this auto generated spec file. Use the groff.spec! ##### -%global groff_base_only 0 -Name: groff-full -Version: 1.22.3 -Release: 0 -Summary: GNU troff Document Formatting System -License: GPL-3.0-or-later -Group: Productivity/Publishing/Troff -Url: http://www.gnu.org/software/groff/groff.html -Source0: ftp://ftp.gnu.org/gnu/groff/groff-%{version}.tar.gz -Source1: ftp://ftp.gnu.org/gnu/groff/groff-%{version}.tar.gz.sig -Source2: groff-full.keyring -Source3: zzz-groff.sh -Source4: zzz-groff.csh -# rm -f foo -# for file in `cat series | grep -v '^#' | grep '^[a-z]' `; do -# cat $file >> foo -# done -##remove a part related to src/preproc/html/pre-html.cpp - see bnc#755533 -# filterdiff -x 'src/preproc/html/pre-html.cpp' foo > groff_1.22.2-2.debian.diff -##remove Debian package string for openSUSE package string -##delete the papersize /etc settings patch -Patch0: groff_1.22.3-1.debian.diff -Patch1: groff-1.20.1-destbufferoverflow.patch -Patch2: groff-1.20.1-nroff-empty-LANGUAGE.patch -Patch3: groff-1.21-groffer-libexecdir.patch -Patch4: groff-1.20.1-deunicode.patch -Patch5: groff-1.21-CVE-2009-5044.patch -#PATCH-FIX-OPENSUSE: splitted patch6 and patch7 from -#http://cvsweb.openwall.com/cgi/cvsweb.cgi/Owl/packages/groff/groff-1.20.1-owl-tmp.diff?rev=1.2;content-type=text%2Fplain -Patch6: groff-1.21-CVE-2009-5080.patch -Patch7: groff-1.21-CVE-2009-5081.patch -#PATCH-FIX-OPENSUSE: FATE#312586 -#sent upstream http://lists.gnu.org/archive/html/bug-groff/2011-09/msg00002.html -#so they would be available on next release of groff -Patch8: 0001-locale-support-in-papersize-definition.patch -Patch9: 0002-documentation-for-the-locale-keyword.patch -# change the papersize definition to force the locale usage -# it can be supressed by /etc/papersize if needed -Patch10: groff-force-locale-usage.patch -# PATCH-FIX-UPSTREAM fix build with multiple threads ; taken from upstream -Patch11: groff-multi-thread.patch -# PATCH-FIX-UPSTREAM e4290210f2c1db5292d97678197a986d6822d044 -Patch12: groff-use-SDE.patch -# PATCH-FIX-UPSTREAM 677274dafc5dd5f79f2a6d16270b21d2f5a16c5b -Patch13: groff-reproducible-mdate.patch -BuildRequires: bison -BuildRequires: fdupes -BuildRequires: gcc-c++ -BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if 0%{?suse_version} > 1220 -BuildRequires: makeinfo -%endif -%if %{groff_base_only} -Recommends: groff-full -%else -BuildRequires: ghostscript-library -BuildRequires: groff -BuildRequires: netpbm -BuildRequires: psutils -# for gxditview and X fontx -BuildRequires: pkgconfig(x11) -BuildRequires: pkgconfig(xaw7) -BuildRequires: pkgconfig(xmu) -BuildRequires: pkgconfig(xt) -# for pre-grohtml and pdfroff -Requires: ghostscript-library -# requires the -base package -Requires: groff = %{version} -Requires: netpbm -Requires: psutils -Requires(post): %{install_info_prereq} -Provides: jgroff = %{version}-%{release} -Provides: normal-groff = %{version}-%{release} -Obsoletes: jgroff < %{version} -# X fonts were moved back -Provides: groff-devx = %{version}-%{release} -Obsoletes: groff-devx <= 1.21 -%endif -%if %{groff_base_only} -%description -The groff package is a stripped-down package containing the necessary -components to read manual pages in ASCII, Latin-1, and UTF-8, plus the -PostScript device (groff's default). Users who want a full groff installation, -with the standard set of devices, fonts, macros, and documentation, should -install the groff-full package. - -%else #groff_base_only -%description -The groff-full package provides aditional tools excluded from base groff -package, like grohtml, X fonts et. all. - -Groff is used to "compile" man pages stored in groff or nroff format -for different output devices, for example, displaying to a screen or in -PostScript(tm) format for printing on a PostScript(tm) printer. Most -programs store their man pages in either %{_mandir}/ or -%{_prefix}/X11R6/man/. - -%package -n groff-doc -Summary: HTML documentation and examples for groff -Group: Productivity/Publishing/Troff -BuildArch: noarch - -%description -n groff-doc -The groff package provides compatible versions of troff, nroff, eqn, -tbl, and other Unix text formatting utilities. - -Groff is used to "compile" man pages stored in groff or nroff format -for different output devices, for example, displaying to a screen or in -PostScript(tm) format for printing on a PostScript(tm) printer. Most -programs store their man pages in either %{_mandir}/ or -%{_prefix}/X11R6/man/. - -%package -n gxditview -Summary: Ditroff Output Displayer for Groff -Group: Productivity/Publishing/Troff -Requires: groff-full = %{version} -# bnc#668254 -Supplements: packageand(groff:xorg-x11-libX11) -Conflicts: jgxdview -Provides: gxdview = %{version}-%{release} -Obsoletes: gxdview < %{version} - -%description -n gxditview -This version of xditview is called gxditview and has some extensions -used by the groff command. gxditview is used by groff if called with -the -X option. - -%endif #groff_base_only - -%prep -%setup -q -n groff-%{version} -%patch0 -p1 -b .debian -%patch1 -%patch2 -p1 -b .bnc540600 -%patch3 -p1 -b .groffer-libexecdir -%patch4 -p1 -b .deunicode -%patch5 -p1 -b .CVE-2009-5044 -%patch6 -p1 -b .CVE-2009-5080 -%patch7 -p1 -%patch8 -p1 -b .locale -%patch9 -p1 -b .locale2 -%patch10 -p1 -b .force-locale -%patch11 -b .multithread -%patch12 -p1 -%patch13 -p1 - -%build -PATH=$PWD/src/roff/troff:$PWD/src/preproc/pic:$PWD/src/preproc/eqn:$PWD/src/preproc/tbl:$PWDsrc/preproc/refer:$PWD/src/preproc/soelim:$PATH -PATH=$PWD/src/roff/grog:$PWD/src/roff/groff:$PWD/src/devices/grops:$PWD/src/devices/grotty:$PWD/src/devices/grodvi:$PWD/src/devices/grohtml:$PATH -GROFF_COMMAND_PREFIX= -GROFF_FONT_PATH=$PWD -GROFF_TMAC_PATH=$PWD/tmac:$PWD/src/roff/troff -export PATH GROFF_COMMAND_PREFIX GROFF_FONT_PATH GROFF_TMAC_PATH -export CFLAGS="%{optflags} -fno-strict-aliasing -fPIE" -export CXXFLAGS="%{optflags} -fno-strict-aliasing -fPIE" -export LDFLAGS="-pie" -# Libdir override as we don't have any arch dependant code just pl scripts -%configure \ - --libdir=%{_libexecdir} \ - --with-appresdir=%{_datadir}/X11/app-defaults \ - --with-grofferdir=%{_libexecdir}/groff/groffer -make %{?_smp_mflags} - -%install -%if %{groff_base_only} - install -d -m 0755 %{buildroot}%{_bindir} - install -d -m 0755 %{buildroot}%{_mandir}/man1 - install -d -m 0755 %{buildroot}%{_datadir}/%{name}/%{version}/ - install -d -m 0755 %{buildroot}%{_datadir}/%{name}/%{version}/font/ - install -d -m 0755 %{buildroot}%{_datadir}/%{name}/%{version}/tmac/ - install -d -m 0755 %{buildroot}%{_datadir}/%{name}/%{version}/tmac/mdoc/ - install -d -m 0755 %{buildroot}%{_datadir}/%{name}/site-tmac/ - install -d -m 0755 %{buildroot}%{_libexecdir}/groff/grog/ -%else - make DESTDIR=%{buildroot} install %{?_smp_mflags} docdir=%{_defaultdocdir}/groff -%endif - -### see Debian's groff-base.install.in ### -for BIN in eqn groff grog grops grotty neqn nroff pic preconv soelim tbl troff; do - -%if %{groff_base_only} - # install binary - install -m 0755 $(find . -type f -name ${BIN}) %{buildroot}/%{_bindir}/ - - # install man - MAN_SOURCE=$(find src -name "${BIN}.n") - MAN_DEST="${MAN_SOURCE%.n}.1" # replace suffix .n by .1 - MAN_DEST="${MAN_DEST##*/}" # remove the path/before/ - install -m 0644 "${MAN_SOURCE}" "%{buildroot}%{_mandir}/man1/${MAN_DEST}" -%else - # remove binary already in groff.rpm - rm %{buildroot}/%{_bindir}/${BIN} - # remove manual already in groff.rpm - rm %{buildroot}/%{_mandir}/man1/${BIN}.* -%endif - -done - -%if %{groff_base_only} - # datadir - install -m 0644 src/utils/indxbib/eign %{buildroot}%{_datadir}/%{name}/%{version}/ -%else - rm %{buildroot}%{_datadir}/groff/%{version}/eign -%endif - -%if %{groff_base_only} - install -m 0644 src/roff/grog/subs.pl %{buildroot}%{_libexecdir}/groff/grog/subs.pl -%else - rm %{buildroot}%{_libexecdir}/groff/grog/subs.pl -%endif - -for FONT in devascii devlatin1 devps devutf8; do -%if %{groff_base_only} - cp -pr "font/${FONT}" %{buildroot}%{_datadir}/%{name}/%{version}/font/ -%else - rm -r %{buildroot}%{_datadir}/groff/%{version}/font/${FONT} -%endif -done - -for TMAC in a4.tmac an-ext.tmac an-old.tmac an.tmac andoc.tmac composite.tmac \ - cp1047.tmac cs.tmac de.tmac den.tmac devtag.tmac doc.tmac \ - doc-old.tmac e.tmac eqnrc europs.tmac fallbacks.tmac fr.tmac \ - hyphen.cs hyphen.den hyphen.det hyphen.fr hyphen.sv hyphen.us \ - hyphenex.cs hyphenex.det hyphenex.us ja.tmac latin1.tmac latin2.tmac \ - latin5.tmac latin9.tmac man.tmac mandoc.tmac mdoc.tmac me.tmac \ - ms.tmac papersize.tmac pic.tmac ps.tmac psatk.tmac psold.tmac \ - pspic.tmac refer-me.tmac refer-ms.tmac refer.tmac s.tmac \ - safer.tmac sv.tmac trace.tmac trans.tmac troffrc troffrc-end \ - tty-char.tmac tty.tmac unicode.tmac www.tmac -do -%if %{groff_base_only} - install -m 0644 tmac/${TMAC} %{buildroot}%{_datadir}/%{name}/%{version}/tmac/ -%else - rm %{buildroot}%{_datadir}/groff/%{version}/tmac/${TMAC} -%endif -done - -%if %{groff_base_only} - install -m 0644 tmac/{man,mdoc}.local %{buildroot}%{_datadir}/%{name}/site-tmac/ -%else - rm %{buildroot}%{_datadir}/groff/site-tmac/{man,mdoc}.local -%endif - -pushd contrib/mm/ -%if %{groff_base_only} - install -d -m 0755 %{buildroot}%{_datadir}/%{name}/%{version}/tmac/mm - install -c -m 0755 mmroff %{buildroot}%{_bindir}/mmroff - install -c -m 0644 mmroff.n %{buildroot}%{_mandir}/man1/mmroff.1 - for f in 0.MT 5.MT 4.MT ms.cov se_ms.cov ; do - install -c -m 644 mm/$f %{buildroot}%{_datadir}/%{name}/%{version}/tmac/mm/$f - done - for f in locale se_locale; do - touch %{buildroot}%{_datadir}/%{name}/%{version}/tmac/mm/$f - chmod 0644 %{buildroot}%{_datadir}/%{name}/%{version}/tmac/mm/$f - done - for f in *.tmac; do - install -c -m 644 $f %{buildroot}%{_datadir}/%{name}/%{version}/tmac/$f - done -%else - rm %{buildroot}%{_bindir}/mmroff - rm %{buildroot}%{_mandir}/man1/mmroff.1* - rm -rf %{buildroot}%{_datadir}/groff/%{version}/tmac/mm/ - for f in *.tmac; do - rm -f %{buildroot}%{_datadir}/groff/%{version}/tmac/$f - done -%endif -popd - -%if %{groff_base_only} -install -m 0644 tmac/doc-common tmac/doc-ditroff tmac/doc-nroff tmac/doc-syms \ - %{buildroot}%{_datadir}/%{name}/%{version}/tmac/mdoc/ -%else -rm -rf %{buildroot}%{_datadir}/groff/%{version}/tmac/mdoc -%endif - -%if %{groff_base_only} - -ln -s -f current %{buildroot}%{_datadir}/%{name}/%{version} - -# compat symlinks -ln -s -f eqn %{buildroot}%{_bindir}/geqn -ln -s -f tbl %{buildroot}%{_bindir}/gtbl - -# install profiles to disable the use of ANSI colour sequences by default: -install -d -m 0755 %{buildroot}/%{_sysconfdir}/profile.d -install -m 644 %{SOURCE3} %{SOURCE4} %{buildroot}/%{_sysconfdir}/profile.d/ - -%endif #groff_base_only - -%fdupes -s %{buildroot} - -%if ! %{groff_base_only} -%post -%install_info --info-dir=%{_infodir} %{_infodir}/groff.info.gz - -%preun -%install_info_delete --info-dir=%{_infodir} %{_infodir}/groff.info.gz -%endif - -%if %{groff_base_only} -%files -%defattr(-,root,root) -%license COPYING FDL LICENSES -%doc BUG-REPORT ChangeLog* MANIFEST MORE.STUFF NEWS PROBLEMS PROJECTS README REVISION VERSION -%{_mandir}/man1/* -%{_bindir}/* -%config %{_sysconfdir}/profile.d/zzz-%{name}.*sh -%{_datadir}/%{name} -%dir %{_libexecdir}/groff -%dir %{_libexecdir}/groff/grog -%{_libexecdir}/groff/grog/subs.pl - -%else #groff_base_only -%files -%defattr(-,root,root) -%dir %{_datadir}/groff/%{version} -%dir %{_libexecdir}/groff -%doc %{_docdir}/groff -%dir %{_libexecdir}/groff -%dir %{_libexecdir}/groff/glilypond -%{_libexecdir}/groff/glilypond/args.pl -%{_libexecdir}/groff/glilypond/oop_fh.pl -%{_libexecdir}/groff/glilypond/subs.pl -%dir %{_libexecdir}/groff/gpinyin -%{_libexecdir}/groff/gpinyin/subs.pl -%{_libexecdir}/groff/groff_opts_no_arg.txt -%{_libexecdir}/groff/groff_opts_with_arg.txt -%exclude %{_docdir}/groff/html -%exclude %{_docdir}/groff/examples -%{_infodir}/groff* -%{_mandir}/man*/* -%exclude %{_mandir}/man1/gxditview.1* -%{_bindir}/* -%exclude %{_bindir}/gxditview -%dir %{_datadir}/groff -%{_datadir}/groff/%{version}/font -%{_datadir}/groff/%{version}/oldfont -%{_datadir}/groff/%{version}/pic -%{_datadir}/groff/%{version}/tmac -%{_datadir}/groff/current -%{_datadir}/groff/site-tmac -%{_libexecdir}/groff/groffer - -%files -n groff-doc -%defattr(-, root, root) -%dir %{_docdir}/groff -%doc %{_docdir}/groff/html -%doc %{_docdir}/groff/examples - -%files -n gxditview -%defattr(-,root,root) -%dir %{_datadir}/X11/app-defaults -%doc src/devices/xditview/ChangeLog -%doc src/devices/xditview/README -%doc src/devices/xditview/TODO -%{_bindir}/gxditview -%{_mandir}/man1/gxditview.1* -%{_datadir}/X11/app-defaults/GXditview -%{_datadir}/X11/app-defaults/GXditview-color - -%endif #groff_base_only - -%changelog diff --git a/groff.changes b/groff.changes index 6316942..2c844ac 100644 --- a/groff.changes +++ b/groff.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu Jan 3 12:52:35 UTC 2019 - Tomáš Chvátal + +- Switch to multibuild in order to avoid having to manage 2 + differentiating spec files + ------------------------------------------------------------------- Wed Oct 30 23:50:14 UTC 2018 - Bernhard Wiedemann diff --git a/groff-full.keyring b/groff.keyring similarity index 100% rename from groff-full.keyring rename to groff.keyring diff --git a/groff.spec b/groff.spec index 611abf1..ca08ee6 100644 --- a/groff.spec +++ b/groff.spec @@ -1,7 +1,7 @@ # # spec file for package groff # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,11 +12,16 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # -%global groff_base_only 1 +%global flavor @BUILD_FLAVOR@%{nil} +%if "%{flavor}" == "full" +%bcond_without full_build +%else +%bcond_with full_build +%endif Name: groff Version: 1.22.3 Release: 0 @@ -26,7 +31,7 @@ Group: Productivity/Publishing/Troff Url: http://www.gnu.org/software/groff/groff.html Source0: ftp://ftp.gnu.org/gnu/groff/groff-%{version}.tar.gz Source1: ftp://ftp.gnu.org/gnu/groff/groff-%{version}.tar.gz.sig -Source2: groff-full.keyring +Source2: groff.keyring Source3: zzz-groff.sh Source4: zzz-groff.csh # rm -f foo @@ -65,10 +70,8 @@ BuildRequires: bison BuildRequires: fdupes BuildRequires: gcc-c++ BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if 0%{?suse_version} > 1220 BuildRequires: makeinfo -%endif -%if %{groff_base_only} +%if !%{with full_build} Recommends: groff-full %else BuildRequires: ghostscript-library @@ -94,7 +97,8 @@ Obsoletes: jgroff < %{version} Provides: groff-devx = %{version}-%{release} Obsoletes: groff-devx <= 1.21 %endif -%if %{groff_base_only} + +%if !%{with full_build} %description The groff package is a stripped-down package containing the necessary components to read manual pages in ASCII, Latin-1, and UTF-8, plus the @@ -109,9 +113,7 @@ package, like grohtml, X fonts et. all. Groff is used to "compile" man pages stored in groff or nroff format for different output devices, for example, displaying to a screen or in -PostScript(tm) format for printing on a PostScript(tm) printer. Most -programs store their man pages in either %{_mandir}/ or -%{_prefix}/X11R6/man/. +PostScript(tm) format for printing on a PostScript(tm) printer. %package -n groff-doc Summary: HTML documentation and examples for groff @@ -124,9 +126,7 @@ tbl, and other Unix text formatting utilities. Groff is used to "compile" man pages stored in groff or nroff format for different output devices, for example, displaying to a screen or in -PostScript(tm) format for printing on a PostScript(tm) printer. Most -programs store their man pages in either %{_mandir}/ or -%{_prefix}/X11R6/man/. +PostScript(tm) format for printing on a PostScript(tm) printer. %package -n gxditview Summary: Ditroff Output Displayer for Groff @@ -180,7 +180,7 @@ export LDFLAGS="-pie" make %{?_smp_mflags} %install -%if %{groff_base_only} +%if !%{with full_build} install -d -m 0755 %{buildroot}%{_bindir} install -d -m 0755 %{buildroot}%{_mandir}/man1 install -d -m 0755 %{buildroot}%{_datadir}/%{name}/%{version}/ @@ -196,7 +196,7 @@ make %{?_smp_mflags} ### see Debian's groff-base.install.in ### for BIN in eqn groff grog grops grotty neqn nroff pic preconv soelim tbl troff; do -%if %{groff_base_only} +%if !%{with full_build} # install binary install -m 0755 $(find . -type f -name ${BIN}) %{buildroot}/%{_bindir}/ @@ -214,21 +214,21 @@ for BIN in eqn groff grog grops grotty neqn nroff pic preconv soelim tbl troff; done -%if %{groff_base_only} +%if !%{with full_build} # datadir install -m 0644 src/utils/indxbib/eign %{buildroot}%{_datadir}/%{name}/%{version}/ %else rm %{buildroot}%{_datadir}/groff/%{version}/eign %endif -%if %{groff_base_only} +%if !%{with full_build} install -m 0644 src/roff/grog/subs.pl %{buildroot}%{_libexecdir}/groff/grog/subs.pl %else rm %{buildroot}%{_libexecdir}/groff/grog/subs.pl %endif for FONT in devascii devlatin1 devps devutf8; do -%if %{groff_base_only} +%if !%{with full_build} cp -pr "font/${FONT}" %{buildroot}%{_datadir}/%{name}/%{version}/font/ %else rm -r %{buildroot}%{_datadir}/groff/%{version}/font/${FONT} @@ -246,21 +246,21 @@ for TMAC in a4.tmac an-ext.tmac an-old.tmac an.tmac andoc.tmac composite.tmac \ safer.tmac sv.tmac trace.tmac trans.tmac troffrc troffrc-end \ tty-char.tmac tty.tmac unicode.tmac www.tmac do -%if %{groff_base_only} +%if !%{with full_build} install -m 0644 tmac/${TMAC} %{buildroot}%{_datadir}/%{name}/%{version}/tmac/ %else rm %{buildroot}%{_datadir}/groff/%{version}/tmac/${TMAC} %endif done -%if %{groff_base_only} +%if !%{with full_build} install -m 0644 tmac/{man,mdoc}.local %{buildroot}%{_datadir}/%{name}/site-tmac/ %else rm %{buildroot}%{_datadir}/groff/site-tmac/{man,mdoc}.local %endif pushd contrib/mm/ -%if %{groff_base_only} +%if !%{with full_build} install -d -m 0755 %{buildroot}%{_datadir}/%{name}/%{version}/tmac/mm install -c -m 0755 mmroff %{buildroot}%{_bindir}/mmroff install -c -m 0644 mmroff.n %{buildroot}%{_mandir}/man1/mmroff.1 @@ -284,14 +284,14 @@ pushd contrib/mm/ %endif popd -%if %{groff_base_only} +%if !%{with full_build} install -m 0644 tmac/doc-common tmac/doc-ditroff tmac/doc-nroff tmac/doc-syms \ %{buildroot}%{_datadir}/%{name}/%{version}/tmac/mdoc/ %else rm -rf %{buildroot}%{_datadir}/groff/%{version}/tmac/mdoc %endif -%if %{groff_base_only} +%if !%{with full_build} ln -s -f current %{buildroot}%{_datadir}/%{name}/%{version} @@ -307,7 +307,7 @@ install -m 644 %{SOURCE3} %{SOURCE4} %{buildroot}/%{_sysconfdir}/profile.d/ %fdupes -s %{buildroot} -%if ! %{groff_base_only} +%if %{with full_build} %post %install_info --info-dir=%{_infodir} %{_infodir}/groff.info.gz @@ -315,7 +315,7 @@ install -m 644 %{SOURCE3} %{SOURCE4} %{buildroot}/%{_sysconfdir}/profile.d/ %install_info_delete --info-dir=%{_infodir} %{_infodir}/groff.info.gz %endif -%if %{groff_base_only} +%if !%{with full_build} %files %defattr(-,root,root) %license COPYING FDL LICENSES diff --git a/pre_checkin.sh b/pre_checkin.sh deleted file mode 100644 index 8ba6a78..0000000 --- a/pre_checkin.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -EDIT_WARNING="##### WARNING: please do not edit this auto generated spec file. Use the groff.spec! #####\n" -sed "s/^%global groff_base_only.*$/${EDIT_WARNING}%global groff_base_only 0/; - s/^Name.*groff/Name: groff-full/; - " < groff.spec > groff-full.spec -cp groff.changes groff-full.changes