.

OBS-URL: https://build.opensuse.org/package/show/Base:System/man?expand=0&rev=34
2012-10-02 17:06:04 +00:00
parent 85696dd54c
commit f9d228b03d
21 changed files with 894 additions and 1744 deletions
--- a/man.spec
+++ b/man.spec
@@ -25,9 +25,13 @@ BuildRequires:  gettext-tools
 BuildRequires:  groff
 BuildRequires:  less
 BuildRequires:  libbz2-devel
+BuildRequires:  libpipeline-devel
 BuildRequires:  libzio-devel
+BuildRequires:  pkg-config
+BuildRequires:  po4a
+BuildRequires:  xz-devel
 BuildRequires:  zlib-devel
-Version:        2.5.2
+Version:        2.6.3
 Release:        0
 Summary:        A Program for Displaying man Pages
 License:        GPL-2.0+
@@ -38,25 +42,21 @@ Provides:       man_db
 Requires:       glibc-locale
 Requires:       groff >= 1.18
 Requires:       less
-Source:         man-db-%{version}.tar.bz2
+Source:         man-db-%{version}.tar.xz
 Source1:        sysconfig.cron-man
 Source2:        cron.daily.do_mandb
 Source3:        cron.daily.clean_catman
 Source4:        mancoding
+Source5:        wrapper.c
 Patch0:         man-db-%{version}.dif
-Patch1:         man-db_%{version}-2.diff.bz2
+Source6:        man-db-2.6.3-man0.dif
 Patch2:         man-db-2.3.19deb4.0-groff.dif
-Patch4:         man-db-2.4.3-section.dif
-Patch5:         man-db-2.5.1-security4.dif
-Patch6:         man-db-2.4.3-firefox.dif
-Patch7:         man-db-%{version}-chinese.dif
-Patch8:         man-db-2.5.1-globbing.dif
-Patch9:         man-db-2.5.1-zio.dif
-Patch10:        man-db-2.5.1-listall.dif
-Patch11:        man-db-%{version}-catp.dif
-Patch12:        man-db-2.5.2-fastpipe.dif
-Patch13:        man-db-2.5.2-fhs.dif
-Patch14:        automake-1.12.patch
+Patch4:         man-db-2.6.3-section.dif
+Patch5:         man-db-2.6.3-security4.dif
+Patch6:         man-db-2.6.3-firefox.dif
+Patch7:         man-db-2.6.3-chinese.dif
+Patch9:         man-db-2.6.3-zio.dif
+Patch10:        man-db-2.6.3-listall.dif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 %global         _sysconfdir /etc

@@ -74,22 +74,14 @@ Authors:

 %prep
 %setup -n man-db-%{version}
-%patch1  -p1 -b .debian
 %patch2  -p0 -b .groff
 %patch4  -p0 -b .sect
 %patch5  -p0 -b .secu4
 %patch6  -p0 -b .firefox
 %patch7  -p0 -b .chinese
-%patch8  -p0 -b .globbing
 %patch9  -p0 -b .zio
 %patch10 -p0 -b .listall
-%patch11 -p0 -b .catp
-%patch12 -p0 -b .fp
-%patch13 -p0 -b .fhs
-%patch0   -p0
-%if 0%{?suse_version} > 1210
-%patch14 -p1
-%endif
+%patch0  -p0

 %build
    gettextize --force --copy --no-changelog
@@ -115,40 +107,35 @@ Authors:
 	 Cg g s m)
    SEC="${SEC[@]}"
    rm -f configure
-    CFLAGS="${RPM_OPT_FLAGS} -funroll-loops -pipe -D_GNU_SOURCE -D_SVID_SOURCE -Wall"
+%global optflags %{optflags} -funroll-loops -pipe -D_GNU_SOURCE -D_SVID_SOURCE -Wall
+    CFLAGS="%{optflags}"
    LDFLAGS=
    LIBS=
-    export CFLAGS LDFLAGS LIBS
-%if %suse_version > 1030
-    aclocal  -I ${PWD}/m4 -I ${PWD}/gnulib/m4
-    autoconf -B ${PWD}/m4 -B ${PWD}/gnulib/m4
+    LINGUAS=
+    for d in $(cat man/LINGUAS*) ; do
+	test -d %{_datadir}/locale/$d || continue
+	LINGUAS="${LINGUAS:+$LINGUAS }$d"
+    done
+    export CFLAGS LDFLAGS LIBS LINGUAS
+    aclocal  -I ${PWD} -I ${PWD}/m4 -I ${PWD}/gnulib/m4
+    autoconf -B ${PWD} -B ${PWD}/m4 -B ${PWD}/gnulib/m4
    automake --add-missing
-%else
-    sed -ri 's/(m4_PACKAGE_VERSION,[[:blank:]]*\[)2.61(\])/\12.60\2/' aclocal.m4
-    sed -ri 's/(AM_INIT_AUTOMAKE\(\[)1.10/\11.9.6/' configure.ac
-    sed -ri 's/intl//' Makefile.am
-    aclocal  -I ${PWD}/m4 -I ${PWD}/gnulib/m4
-    autoconf -B ${PWD}/m4 -B ${PWD}/gnulib/m4
-    mkdir -p tools
-    touch tools/compile
-    export MKDIR_P="mkdir -p"
-%endif
-    ./configure \
-	--enable-dups \
-	--enable-setuid=man \
-	--with-device=utf8 \
-	--prefix=%{_prefix} \
-	--mandir=%{_mandir} \
-	--localstatedir=%{_localstatedir} \
-	--libexecdir=%{_prefix}/lib \
-	--with-zio \
-	--with-gnu-ld \
-	--disable-rpath \
-	--enable-mb-groff \
-	--with-db=gdbm \
-	--enable-nls \
+    %configure				\
+	--enable-dups			\
+	--enable-setuid=man		\
+	--with-device=utf8		\
+	--with-zio			\
+	--with-gnu-ld			\
+	--disable-rpath			\
+	--disable-automatic-create	\
+	--enable-automatic-update	\
+	--disable-cats			\
+	--enable-threads=posix		\
+	--enable-mb-groff		\
+	--with-db=gdbm			\
+	--enable-nls			\
 	--with-config-file=%{_sysconfdir}/manpath.config \
-	--without-included-gettext \
+	--without-included-gettext	\
 	--with-sections="${SEC}"
    make %{?_smp_mflags} nls=all
    for man in $(find man/ -type f -a -name '*.man[0-9]'); do
@@ -166,22 +153,33 @@ Authors:
 		"  $man
 	esac
    done
+    gcc $CFLAGS -I gnulib/lib/ -I include/ --include config.h --include configmake.h \
+	-o wrapper %{S:5} -L gnulib/lib/.libs/ -lgnu

 %install
 %if %suse_version <= 1030
    export MKDIR_P="mkdir -p"
 %endif
-    rm -rf %{buildroot}%{_localstatedir}/cache/man
+    rm -rf   %{buildroot}%{_localstatedir}/cache/man
+    mkdir -p %{buildroot}%{_datadir}/doc/packages/man
    mkdir -p %{buildroot}%{_prefix}/lib/man-db
    mkdir -p %{buildroot}%{_bindir}
    mkdir -p %{buildroot}/etc
    make nls=all install DESTDIR=%{buildroot}
-    if test -x %{buildroot}%{_bindir}/wrapper ; then
-	rm -f %{buildroot}%{_bindir}/mandb
-	rm -f %{buildroot}%{_bindir}/man
-	mv %{buildroot}%{_bindir}/wrapper %{buildroot}%{_bindir}/mandb
-	ln -sf mandb %{buildroot}%{_bindir}/man
+    mv      %{buildroot}%{_libdir}/man-db/libman*%{version}.so \
+	    %{buildroot}%{_libdir}/
+    rm -rfv %{buildroot}%{_libdir}/man-db/
+    mv	    %{buildroot}%{_datadir}/doc/man-db/man-db-manual.* \
+	    %{buildroot}%{_datadir}/doc/packages/man/
+    # wrapper
+    if test -x %{buildroot}%{_bindir}/mandb ; then
+	mv %{buildroot}%{_bindir}/mandb %{buildroot}%{_prefix}/lib/man-db/
    fi
+    if test -x %{buildroot}%{_bindir}/man ; then
+	mv %{buildroot}%{_bindir}/man   %{buildroot}%{_prefix}/lib/man-db/
+    fi
+    install wrapper %{buildroot}%{_bindir}/mandb
+    ln -sf mandb    %{buildroot}%{_bindir}/man
    mkdir -p %{buildroot}%{_mandir}
    pushd %{buildroot}%{_mandir}/
    rm -rf *.ascii/
@@ -213,7 +211,8 @@ test -d var/catman/ && rm -rf var/catman/ || true
 %files -f man-db.lang
 %defattr(-,root,root)
 %doc docs/COPYING
-%doc docs/ChangeLog
+%doc ChangeLog
+%doc %{_datadir}/doc/packages/man/man-db-manual.*
 %config /etc/manpath.config
 %attr(0744,root,root) /etc/cron.daily/suse-clean_catman
 %attr(0744,root,root) /etc/cron.daily/suse-do_mandb
@@ -230,25 +229,19 @@ test -d var/catman/ && rm -rf var/catman/ || true
 %{_bindir}/manpath
 %{_bindir}/whatis
 %{_bindir}/zsoelim
-%if %suse_version > 1030
 %dir %attr(0755,root,root) %{_prefix}/lib/man-db
 %attr(0755,root,root) %{_prefix}/lib/man-db/man
 %attr(0755,root,root) %{_prefix}/lib/man-db/mandb
 %attr(0755,man,man)   %{_prefix}/lib/man-db/manconv
 %attr(0755,man,man)   %{_prefix}/lib/man-db/globbing
-%else
-%dir %attr(0711,root,root) %{_prefix}/lib/man-db
-%attr(0711,root,root) %{_prefix}/lib/man-db/man
-%attr(0711,root,root) %{_prefix}/lib/man-db/mandb
-%attr(0711,man,man)   %{_prefix}/lib/man-db/manconv
-%attr(0711,man,man)   %{_prefix}/lib/man-db/globbing
-%endif
 %{_sbindir}/accessdb
+%{_libdir}/libman*.so
 %{_datadir}/groff/site-tmac/tmac.andb
 %{_datadir}/groff/site-tmac/tmac.andocdb
 %doc %{_mandir}/man1/*.1.gz
 %doc %{_mandir}/man5/*.5.gz
 %doc %{_mandir}/man8/*.8.gz
+%dir %{_mandir}/id
 %defattr(-,man,man)
 %{_localstatedir}/cache/man/*
 %{_localstatedir}/adm/fillup-templates/sysconfig.cron-man