Accepting request 412541 from M17N
- Add patch for bnc#989903 and move all scripts from libdir to libexecdir - Add patch for bnc#989903 and move all scripts from libdir to libexecdir (forwarded request 412540 from scarabeus_iv) OBS-URL: https://build.opensuse.org/request/show/412541 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/groff?expand=0&rev=53
This commit is contained in:
Dominique Leuenberger
Git OBS Bridge
commit
37e9a8dbd1
@ -1,3 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
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
|
||||
|
||||
|
||||
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package groff
|
||||
# spec file for package groff-full
|
||||
#
|
||||
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2016 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
|
||||
@ -16,12 +16,9 @@
|
||||
#
|
||||
|
||||
|
||||
##### WARNING: please do not edit this auto generated spec file. Use the groff.spec! #####
|
||||
%global groff_base_only 0
|
||||
%if %{groff_base_only}
|
||||
Name: groff
|
||||
%else
|
||||
Name: groff-full
|
||||
%endif
|
||||
Version: 1.22.3
|
||||
Release: 0
|
||||
Summary: GNU troff Document Formatting System
|
||||
@ -83,7 +80,7 @@ Requires: ghostscript-library
|
||||
Requires: groff = %{version}
|
||||
Requires: netpbm
|
||||
Requires: psutils
|
||||
Requires(pre): %{install_info_prereq}
|
||||
Requires(post): %{install_info_prereq}
|
||||
Provides: jgroff = %{version}-%{release}
|
||||
Provides: normal-groff = %{version}-%{release}
|
||||
Obsoletes: jgroff < %{version}
|
||||
@ -131,9 +128,9 @@ 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}
|
||||
Conflicts: jgxdview
|
||||
|
||||
%description -n gxditview
|
||||
This version of xditview is called gxditview and has some extensions
|
||||
@ -167,7 +164,9 @@ 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}
|
||||
@ -181,6 +180,7 @@ make %{?_smp_mflags}
|
||||
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
|
||||
@ -213,6 +213,12 @@ done
|
||||
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/
|
||||
@ -297,7 +303,7 @@ install -m 644 %{SOURCE3} %{SOURCE4} %{buildroot}/%{_sysconfdir}/profile.d/
|
||||
%post
|
||||
%install_info --info-dir=%{_infodir} %{_infodir}/groff.info.gz
|
||||
|
||||
%postun
|
||||
%preun
|
||||
%install_info_delete --info-dir=%{_infodir} %{_infodir}/groff.info.gz
|
||||
%endif
|
||||
|
||||
@ -305,10 +311,13 @@ install -m 644 %{SOURCE3} %{SOURCE4} %{buildroot}/%{_sysconfdir}/profile.d/
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%doc BUG-REPORT ChangeLog* COPYING FDL LICENSES MANIFEST MORE.STUFF NEWS PROBLEMS PROJECTS README REVISION VERSION
|
||||
%doc %{_mandir}/man1/*
|
||||
%{_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
|
||||
@ -316,21 +325,19 @@ install -m 644 %{SOURCE3} %{SOURCE4} %{buildroot}/%{_sysconfdir}/profile.d/
|
||||
%dir %{_datadir}/groff/%{version}
|
||||
%dir %{_libexecdir}/groff
|
||||
%doc %{_docdir}/groff
|
||||
%dir %{_libdir}/groff
|
||||
%dir %{_libdir}/groff/glilypond
|
||||
%{_libdir}/groff/glilypond/args.pl
|
||||
%{_libdir}/groff/glilypond/oop_fh.pl
|
||||
%{_libdir}/groff/glilypond/subs.pl
|
||||
%dir %{_libdir}/groff/gpinyin
|
||||
%{_libdir}/groff/gpinyin/subs.pl
|
||||
%{_libdir}/groff/groff_opts_no_arg.txt
|
||||
%{_libdir}/groff/groff_opts_with_arg.txt
|
||||
%dir %{_libdir}/groff/grog
|
||||
%{_libdir}/groff/grog/subs.pl
|
||||
%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
|
||||
%doc %{_infodir}/groff*
|
||||
%doc %{_mandir}/man*/*
|
||||
%{_infodir}/groff*
|
||||
%{_mandir}/man*/*
|
||||
%exclude %{_mandir}/man1/gxditview.1*
|
||||
%{_bindir}/*
|
||||
%exclude %{_bindir}/gxditview
|
||||
@ -356,7 +363,7 @@ install -m 644 %{SOURCE3} %{SOURCE4} %{buildroot}/%{_sysconfdir}/profile.d/
|
||||
%doc src/devices/xditview/README
|
||||
%doc src/devices/xditview/TODO
|
||||
%{_bindir}/gxditview
|
||||
%doc %{_mandir}/man1/gxditview.1*
|
||||
%{_mandir}/man1/gxditview.1*
|
||||
%{_datadir}/X11/app-defaults/GXditview
|
||||
%{_datadir}/X11/app-defaults/GXditview-color
|
||||
|
||||
|
||||
@ -1,3 +1,9 @@
|
||||
-------------------------------------------------------------------
|
||||
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
|
||||
|
||||
|
||||
52
groff.spec
52
groff.spec
@ -1,7 +1,7 @@
|
||||
#
|
||||
# spec file for package groff
|
||||
#
|
||||
# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
|
||||
# Copyright (c) 2016 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
|
||||
@ -17,11 +17,7 @@
|
||||
|
||||
|
||||
%global groff_base_only 1
|
||||
%if %{groff_base_only}
|
||||
Name: groff
|
||||
%else
|
||||
Name: groff-full
|
||||
%endif
|
||||
Version: 1.22.3
|
||||
Release: 0
|
||||
Summary: GNU troff Document Formatting System
|
||||
@ -83,7 +79,7 @@ Requires: ghostscript-library
|
||||
Requires: groff = %{version}
|
||||
Requires: netpbm
|
||||
Requires: psutils
|
||||
Requires(pre): %{install_info_prereq}
|
||||
Requires(post): %{install_info_prereq}
|
||||
Provides: jgroff = %{version}-%{release}
|
||||
Provides: normal-groff = %{version}-%{release}
|
||||
Obsoletes: jgroff < %{version}
|
||||
@ -131,9 +127,9 @@ 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}
|
||||
Conflicts: jgxdview
|
||||
|
||||
%description -n gxditview
|
||||
This version of xditview is called gxditview and has some extensions
|
||||
@ -167,7 +163,9 @@ 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}
|
||||
@ -181,6 +179,7 @@ make %{?_smp_mflags}
|
||||
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
|
||||
@ -213,6 +212,12 @@ done
|
||||
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/
|
||||
@ -297,7 +302,7 @@ install -m 644 %{SOURCE3} %{SOURCE4} %{buildroot}/%{_sysconfdir}/profile.d/
|
||||
%post
|
||||
%install_info --info-dir=%{_infodir} %{_infodir}/groff.info.gz
|
||||
|
||||
%postun
|
||||
%preun
|
||||
%install_info_delete --info-dir=%{_infodir} %{_infodir}/groff.info.gz
|
||||
%endif
|
||||
|
||||
@ -305,10 +310,13 @@ install -m 644 %{SOURCE3} %{SOURCE4} %{buildroot}/%{_sysconfdir}/profile.d/
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%doc BUG-REPORT ChangeLog* COPYING FDL LICENSES MANIFEST MORE.STUFF NEWS PROBLEMS PROJECTS README REVISION VERSION
|
||||
%doc %{_mandir}/man1/*
|
||||
%{_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
|
||||
@ -316,21 +324,19 @@ install -m 644 %{SOURCE3} %{SOURCE4} %{buildroot}/%{_sysconfdir}/profile.d/
|
||||
%dir %{_datadir}/groff/%{version}
|
||||
%dir %{_libexecdir}/groff
|
||||
%doc %{_docdir}/groff
|
||||
%dir %{_libdir}/groff
|
||||
%dir %{_libdir}/groff/glilypond
|
||||
%{_libdir}/groff/glilypond/args.pl
|
||||
%{_libdir}/groff/glilypond/oop_fh.pl
|
||||
%{_libdir}/groff/glilypond/subs.pl
|
||||
%dir %{_libdir}/groff/gpinyin
|
||||
%{_libdir}/groff/gpinyin/subs.pl
|
||||
%{_libdir}/groff/groff_opts_no_arg.txt
|
||||
%{_libdir}/groff/groff_opts_with_arg.txt
|
||||
%dir %{_libdir}/groff/grog
|
||||
%{_libdir}/groff/grog/subs.pl
|
||||
%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
|
||||
%doc %{_infodir}/groff*
|
||||
%doc %{_mandir}/man*/*
|
||||
%{_infodir}/groff*
|
||||
%{_mandir}/man*/*
|
||||
%exclude %{_mandir}/man1/gxditview.1*
|
||||
%{_bindir}/*
|
||||
%exclude %{_bindir}/gxditview
|
||||
@ -356,7 +362,7 @@ install -m 644 %{SOURCE3} %{SOURCE4} %{buildroot}/%{_sysconfdir}/profile.d/
|
||||
%doc src/devices/xditview/README
|
||||
%doc src/devices/xditview/TODO
|
||||
%{_bindir}/gxditview
|
||||
%doc %{_mandir}/man1/gxditview.1*
|
||||
%{_mandir}/man1/gxditview.1*
|
||||
%{_datadir}/X11/app-defaults/GXditview
|
||||
%{_datadir}/X11/app-defaults/GXditview-color
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user