diff --git a/sgmltool.changes b/sgmltool.changes index a2075f6..0f56008 100644 --- a/sgmltool.changes +++ b/sgmltool.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Thu Aug 2 12:42:50 UTC 2012 - jengelh@inai.de + +- Parallel build with %_smp_mflags +- Remove redundant tags/sections from specfile, + use %configure + ------------------------------------------------------------------- Mon Jul 30 15:06:54 UTC 2012 - werner@suse.de diff --git a/sgmltool.spec b/sgmltool.spec index b3f3ba5..466f8e6 100644 --- a/sgmltool.spec +++ b/sgmltool.spec @@ -72,32 +72,6 @@ SGML-Tools cannot process arbitrary SGML documents. In such a case, try jade_dsl and write your own DSSSL scripts (take the docbk30 package as an example). - - -Authors: --------- - Cees A. de Groot - Arun Sharma - Andre Schoorl - Daniele Giacomini - Dave Love - Dave Platt - Eric S. Raymond - Francisco J. Montilla - Fabrizio Polacco - Frank Pavageau - Jan Echternach - Henry S. Thompson - Karsten Tinnefeld - Kees de Bruin - Ken MacLeod - Lee Marzke - Marco Budde - Mitchell Perilstein - Sven Rudolph - Tommy Marcus McGuire - Ulrich Windl - %define INSTALL install -m755 %define INSTALL_DIR install -d -m755 %define INSTALL_DATA install -m644 @@ -119,35 +93,28 @@ Authors: %endif %build -CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \ -./configure --prefix=$RPM_BUILD_ROOT/usr \ - --mandir=%{_mandir} \ +CFLAGS="%optflags -fno-strict-aliasing" \ +%configure --prefix="%buildroot/%_prefix" \ --with-installed-nsgmls -make %{?jobs:-j%jobs} "CFLAGS=$RPM_OPT_FLAGS -fno-strict-aliasing" -make install DESTDIR=$RPM_BUILD_ROOT prefix=/usr \ - mandir=%{_mandir} -(cd doc; PATH=$PATH:$RPM_BUILD_ROOT/%_bindir sh Makedoc.sh) +make %{?_smp_mflags} CFLAGS="%optflags -fno-strict-aliasing" +make install DESTDIR="%buildroot" prefix="%_prefix" +(cd doc; PATH="$PATH:%buildroot/%_bindir" sh Makedoc.sh) cp -p doc/README doc/README.doc -# the Makefiles are a bit garstig +# the Makefiles are a bit nasty make clean -CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \ -./configure --prefix=/usr \ - --mandir=%{_mandir} \ +CFLAGS="%optflags -fno-strict-aliasing" \ +%configure \ --with-installed-nsgmls -make %{?jobs:-j%jobs} "CFLAGS=$RPM_OPT_FLAGS -fno-strict-aliasing" +make %{?_smp_mflags} CFLAGS="%optflags -fno-strict-aliasing" %install -: > doc/Makedoc.sh -make install DESTDIR=$RPM_BUILD_ROOT prefix=/usr \ - mandir=%{_mandir} +> doc/Makedoc.sh +make install DESTDIR="%buildroot"; rm -fr $RPM_BUILD_ROOT/usr/doc/sgml-tools perlpath=`ls -1d /usr/lib/perl5/5.*/Text` mkdir -p $RPM_BUILD_ROOT$perlpath mv $RPM_BUILD_ROOT/usr/lib/perl5/Text/EntityMap.pm $RPM_BUILD_ROOT$perlpath/ -%clean -rm -fr $RPM_BUILD_ROOT - %if 0%{suse_version} > 1220 %post mkdir -p /var/run/texlive