forked from pool/groff
fix a build of groff-full
OBS-URL: https://build.opensuse.org/package/show/M17N/groff?expand=0&rev=42
This commit is contained in:
Michal Vyskocil
Git OBS Bridge
parent
f3a219923d
commit
6be709cedb
45
groff-1.21-groffer-libexecdir.patch
Normal file
45
groff-1.21-groffer-libexecdir.patch
Normal file
@ -0,0 +1,45 @@
|
||||
Index: groff-1.22.2/contrib/groffer/Makefile.sub
|
||||
===================================================================
|
||||
--- groff-1.22.2.orig/contrib/groffer/Makefile.sub
|
||||
+++ groff-1.22.2/contrib/groffer/Makefile.sub
|
||||
@@ -73,7 +73,7 @@ groffer: $(GROFFER_PERL) $(GROFFER_SHELL
|
||||
sed -f "$(SH_DEPS_SED_SCRIPT)" \
|
||||
-e "s|@g@|$(g)|g" \
|
||||
-e "s|@BINDIR@|$(DESTDIR)$(bindir)|g" \
|
||||
- -e "s|@libdir@|$(DESTDIR)$(libdir)|g" \
|
||||
+ -e "s|@libexecdir@|$(DESTDIR)$(libexecdir)|g" \
|
||||
-e "s|@groffer_dir@|$(DESTDIR)$(groffer_dir)|g" \
|
||||
-e "s|@VERSION@|$(version)$(revision)|g" \
|
||||
-e "$(SH_SCRIPT_SED_CMD)" \
|
||||
@@ -138,7 +138,7 @@ uninstall_sub:
|
||||
for f in $(GROFFER_PERL_) $(GROFFER_SHELL_) version.sh; do \
|
||||
$(RM) $(DESTDIR)$(groffer_dir)/$$f; \
|
||||
done
|
||||
- -rmdir $(DESTDIR)$(libdir)/groff/groffer
|
||||
+ -rmdir $(DESTDIR)$(libexecdir)/groff/groffer
|
||||
|
||||
########################################################################
|
||||
# Emacs settings
|
||||
Index: groff-1.22.2/Makefile.in
|
||||
===================================================================
|
||||
--- groff-1.22.2.orig/Makefile.in
|
||||
+++ groff-1.22.2/Makefile.in
|
||||
@@ -139,6 +139,9 @@ bindir=@bindir@
|
||||
libdir=@libdir@
|
||||
libprogramdir=$(libdir)/groff
|
||||
|
||||
+# `libexecdir` says where to install script not intended to run as user
|
||||
+libexecdir=@libexecdir@
|
||||
+
|
||||
# `datasubdir' says where to install platform-independent data files.
|
||||
datadir=@datadir@
|
||||
datarootdir=@datarootdir@
|
||||
@@ -811,7 +814,7 @@ $(INCDIRS) $(PROGDEPDIRS) $(OTHERDIRS):
|
||||
fi; \
|
||||
test -d $@ || $(mkinstalldirs) $@; \
|
||||
cd $@; \
|
||||
- $(MAKE) $(MAKE_K_FLAG) $(MDEFINES) srcdir=$$srcdir VPATH=$$srcdir \
|
||||
+ $(MAKE) $(MAKE_K_FLAG) $(MDEFINES) srcdir=$$srcdir libexecdir=$(libexecdir) VPATH=$$srcdir \
|
||||
-f $(top_srcdir)/Makefile.comm \
|
||||
-f $$srcdir/Makefile.sub \
|
||||
-f $(top_srcdir)/Makefile.man $(do)
|
||||
@ -37,8 +37,7 @@ Source4: zzz-groff.csh
|
||||
Patch0: groff_1.22.2-2.debian.diff
|
||||
Patch1: groff-1.20.1-destbufferoverflow.patch
|
||||
Patch2: groff-1.20.1-nroff-empty-LANGUAGE.patch
|
||||
# obsoleted by 1.22.2 - groffer is installed to /usr/lib on 64bit
|
||||
#Patch3: groff-1.21-groffer-libexecdir.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
|
||||
@ -53,8 +52,6 @@ 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
|
||||
# obsoleted by 1.22.2
|
||||
#Patch11: config-guess-sub-update.patch
|
||||
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
BuildRequires: bison
|
||||
@ -155,7 +152,7 @@ the -X option.
|
||||
%patch0 -p1 -b .debian
|
||||
%patch1
|
||||
%patch2 -p1 -b .bnc540600
|
||||
# % patch3 -p1 -b .groffer-libexecdir
|
||||
%patch3 -p1 -b .groffer-libexecdir
|
||||
%patch4 -p1 -b .deunicode
|
||||
%patch5 -p1 -b .CVE-2009-5044
|
||||
%patch6 -p1 -b .CVE-2009-5080
|
||||
@ -163,7 +160,9 @@ the -X option.
|
||||
%patch8 -p1 -b .locale
|
||||
%patch9 -p1 -b .locale
|
||||
%patch10 -p1 -b .force-locale
|
||||
# % patch11
|
||||
|
||||
#from patch7
|
||||
rm doc/groff.info-2.orig
|
||||
|
||||
%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
|
||||
@ -178,7 +177,8 @@ export PATH GROFF_COMMAND_PREFIX GROFF_FONT_PATH GROFF_TMAC_PATH
|
||||
export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
|
||||
export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
|
||||
%{configure} \
|
||||
--with-appresdir=%{_datadir}/X11/app-defaults
|
||||
--with-appresdir=%{_datadir}/X11/app-defaults \
|
||||
--with-grofferdir=%{_libexecdir}/groff/groffer
|
||||
|
||||
#ulimit -c unlimited
|
||||
make %{?_smp_mflags}
|
||||
@ -296,6 +296,7 @@ rm -rf %{buildroot}%{_datadir}/groff/%{version}/tmac/mdoc
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%dir %{_datadir}/groff/%{version}
|
||||
%dir %{_libexecdir}/groff
|
||||
%doc %{_docdir}/groff
|
||||
%exclude %{_docdir}/groff/html
|
||||
%exclude %{_docdir}/groff/examples
|
||||
|
||||
@ -12,7 +12,6 @@ Thu May 9 09:16:49 UTC 2013 - mvyskocil@suse.com
|
||||
documents from files formatted with the -mom macros.
|
||||
* and a lot more, see NEWS for details
|
||||
- obsoletes:
|
||||
groff-1.21-groffer-libexecdir.patch, already fixed upstream
|
||||
config-guess-sub-update.patch, dtto
|
||||
groff_1.21-6.debian.diff, replaced by
|
||||
- added groff_1.22.2-2.debian.diff
|
||||
|
||||
15
groff.spec
15
groff.spec
@ -36,8 +36,7 @@ Source4: zzz-groff.csh
|
||||
Patch0: groff_1.22.2-2.debian.diff
|
||||
Patch1: groff-1.20.1-destbufferoverflow.patch
|
||||
Patch2: groff-1.20.1-nroff-empty-LANGUAGE.patch
|
||||
# obsoleted by 1.22.2 - groffer is installed to /usr/lib on 64bit
|
||||
#Patch3: groff-1.21-groffer-libexecdir.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
|
||||
@ -52,8 +51,6 @@ 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
|
||||
# obsoleted by 1.22.2
|
||||
#Patch11: config-guess-sub-update.patch
|
||||
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
BuildRequires: bison
|
||||
@ -154,7 +151,7 @@ the -X option.
|
||||
%patch0 -p1 -b .debian
|
||||
%patch1
|
||||
%patch2 -p1 -b .bnc540600
|
||||
# % patch3 -p1 -b .groffer-libexecdir
|
||||
%patch3 -p1 -b .groffer-libexecdir
|
||||
%patch4 -p1 -b .deunicode
|
||||
%patch5 -p1 -b .CVE-2009-5044
|
||||
%patch6 -p1 -b .CVE-2009-5080
|
||||
@ -162,7 +159,9 @@ the -X option.
|
||||
%patch8 -p1 -b .locale
|
||||
%patch9 -p1 -b .locale
|
||||
%patch10 -p1 -b .force-locale
|
||||
# % patch11
|
||||
|
||||
#from patch7
|
||||
rm doc/groff.info-2.orig
|
||||
|
||||
%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
|
||||
@ -177,7 +176,8 @@ export PATH GROFF_COMMAND_PREFIX GROFF_FONT_PATH GROFF_TMAC_PATH
|
||||
export CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
|
||||
export CXXFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing"
|
||||
%{configure} \
|
||||
--with-appresdir=%{_datadir}/X11/app-defaults
|
||||
--with-appresdir=%{_datadir}/X11/app-defaults \
|
||||
--with-grofferdir=%{_libexecdir}/groff/groffer
|
||||
|
||||
#ulimit -c unlimited
|
||||
make %{?_smp_mflags}
|
||||
@ -295,6 +295,7 @@ rm -rf %{buildroot}%{_datadir}/groff/%{version}/tmac/mdoc
|
||||
%files
|
||||
%defattr(-,root,root)
|
||||
%dir %{_datadir}/groff/%{version}
|
||||
%dir %{_libexecdir}/groff
|
||||
%doc %{_docdir}/groff
|
||||
%exclude %{_docdir}/groff/html
|
||||
%exclude %{_docdir}/groff/examples
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user