diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index e69de29..0000000 diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..a850c19 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +xmlroff-0.5.2.tar.gz diff --git a/Makefile b/Makefile deleted file mode 100644 index fd86979..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: xmlroff -# $Id$ -NAME := xmlroff -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/sources b/sources index e69de29..dfe9f11 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +44149659ebbcec493a110f264738ea14 xmlroff-0.5.2.tar.gz diff --git a/xmlroff-0.5.2-nolibxslt.patch b/xmlroff-0.5.2-nolibxslt.patch new file mode 100644 index 0000000..298772f --- /dev/null +++ b/xmlroff-0.5.2-nolibxslt.patch @@ -0,0 +1,12 @@ +diff -up xmlroff-0.5.2/libfo-0.5.pc.in.nolibxslt xmlroff-0.5.2/libfo-0.5.pc.in +--- xmlroff-0.5.2/libfo-0.5.pc.in.nolibxslt 2007-11-03 02:56:33.000000000 -0400 ++++ xmlroff-0.5.2/libfo-0.5.pc.in 2007-11-03 02:56:44.000000000 -0400 +@@ -10,7 +10,7 @@ compat_stylesheet=@prefix@/share/xml/lib + Name: libfo + Description: XSL formatter library for xmlroff + Version: @VERSION@ +-Requires: @GNOMEPRINT_REQUIRES@ glib-2.0 gobject-2.0 gmodule-2.0 libxslt gdk-pixbuf-2.0 ++Requires: @GNOMEPRINT_REQUIRES@ glib-2.0 gobject-2.0 gmodule-2.0 libxml-2.0 gdk-pixbuf-2.0 + Libs: -L${libdir} -lfo-@LT_RELEASE@ @GNOMEPRINT_LIBS@ + Cflags: -I${pkgincludedir} @GNOMEPRINT_CFLAGS@ + diff --git a/xmlroff-0.5.2-rpath.patch b/xmlroff-0.5.2-rpath.patch new file mode 100644 index 0000000..ff04b72 --- /dev/null +++ b/xmlroff-0.5.2-rpath.patch @@ -0,0 +1,96 @@ +diff -up xmlroff-0.5.2/aclocal.m4.rpath xmlroff-0.5.2/aclocal.m4 +--- xmlroff-0.5.2/aclocal.m4.rpath 2007-08-28 13:59:44.000000000 -0400 ++++ xmlroff-0.5.2/aclocal.m4 2007-08-28 14:01:40.000000000 -0400 +@@ -2813,7 +2813,7 @@ if test "$GXX" = yes; then + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='' + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + + # If archive_cmds runs LD, not CC, wlarc should be empty +@@ -3283,7 +3283,7 @@ case $host_os in + # dependencies. + output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' + +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath,$libdir' ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='' + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + + # Archives containing C++ object files must be created using +@@ -3320,7 +3320,7 @@ case $host_os in + _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' + +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='' + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' + ;; +@@ -5414,7 +5414,7 @@ ifelse([$1],[CXX],[ + # are reset later if shared libraries are not supported. Putting them + # here allows them to be overridden if necessary. + runpath_var=LD_RUN_PATH +- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir' ++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='' + _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic' + # ancient GNU ld didn't support --whole-archive et. al. + if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then +diff -up xmlroff-0.5.2/configure.rpath xmlroff-0.5.2/configure +--- xmlroff-0.5.2/configure.rpath 2007-08-28 13:59:35.000000000 -0400 ++++ xmlroff-0.5.2/configure 2007-08-28 14:02:24.000000000 -0400 +@@ -7964,7 +7964,7 @@ cc_basename=`$echo "X$cc_temp" | $Xsed - + # are reset later if shared libraries are not supported. Putting them + # here allows them to be overridden if necessary. + runpath_var=LD_RUN_PATH +- hardcode_libdir_flag_spec='${wl}--rpath ${wl}$libdir' ++ hardcode_libdir_flag_spec='' + export_dynamic_flag_spec='${wl}--export-dynamic' + # ancient GNU ld didn't support --whole-archive et. al. + if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then +@@ -11299,7 +11299,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld + archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib' + archive_expsym_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib' + +- hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir' ++ hardcode_libdir_flag_spec_CXX='' + export_dynamic_flag_spec_CXX='${wl}--export-dynamic' + + # If archive_cmds runs LD, not CC, wlarc should be empty +@@ -11900,7 +11900,7 @@ if test -z "$aix_libpath"; then aix_libp + # dependencies. + output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | grep "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list' + +- hardcode_libdir_flag_spec_CXX='${wl}--rpath,$libdir' ++ hardcode_libdir_flag_spec_CXX='' + export_dynamic_flag_spec_CXX='${wl}--export-dynamic' + + # Archives containing C++ object files must be created using +@@ -11937,7 +11937,7 @@ if test -z "$aix_libpath"; then aix_libp + archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib' + archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib' + +- hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir' ++ hardcode_libdir_flag_spec_CXX='' + export_dynamic_flag_spec_CXX='${wl}--export-dynamic' + whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive' + ;; +@@ -14642,7 +14642,7 @@ cc_basename=`$echo "X$cc_temp" | $Xsed - + # are reset later if shared libraries are not supported. Putting them + # here allows them to be overridden if necessary. + runpath_var=LD_RUN_PATH +- hardcode_libdir_flag_spec_F77='${wl}--rpath ${wl}$libdir' ++ hardcode_libdir_flag_spec_F77='' + export_dynamic_flag_spec_F77='${wl}--export-dynamic' + # ancient GNU ld didn't support --whole-archive et. al. + if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then +@@ -17233,7 +17233,7 @@ cc_basename=`$echo "X$cc_temp" | $Xsed - + # are reset later if shared libraries are not supported. Putting them + # here allows them to be overridden if necessary. + runpath_var=LD_RUN_PATH +- hardcode_libdir_flag_spec_GCJ='${wl}--rpath ${wl}$libdir' ++ hardcode_libdir_flag_spec_GCJ='' + export_dynamic_flag_spec_GCJ='${wl}--export-dynamic' + # ancient GNU ld didn't support --whole-archive et. al. + if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then diff --git a/xmlroff.spec b/xmlroff.spec new file mode 100644 index 0000000..9141581 --- /dev/null +++ b/xmlroff.spec @@ -0,0 +1,103 @@ +Name: xmlroff +Version: 0.5.2 +Release: 4%{?dist} +Summary: A XSL-FO processor + +Group: Applications/Publishing +License: BSD +URL: http://xmlroff.org/ +Source0: http://xmlroff.org/download/%{name}-%{version}.tar.gz +Patch0: xmlroff-0.5.2-rpath.patch +Patch1: xmlroff-0.5.2-nolibxslt.patch +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: libxslt-devel gtk2-devel gtk-doc +Requires: libfo = %{version}-%{release} + +%description +xmlroff is a fast, free, high-quality, multi-platform XSL formatter that aims +to excel at DocBook formatting and that integrates easily with other programs +and with scripting languages. + +%package -n libfo +Summary: A XSL-FO processing library +Group: System Environment/Libraries +Requires: xml-common + +%description -n libfo +libfo is a library that provides XSL-FO services. + +%package -n libfo-devel +Summary: Files for developing with libfo +Group: Development/Libraries +Requires: libfo = %{version}-%{release} +Requires: gtk2-devel pkgconfig libxml2-devel + +%description -n libfo-devel +This package contains headers and other files for developing applications +that use libfo. + +%prep +%setup -q +%patch -p1 -b .rpath +%patch1 -p1 -b .nolibxslt + +%build +%configure --disable-static +make %{?_smp_mflags} + +%install +rm -rf $RPM_BUILD_ROOT +make install DESTDIR=$RPM_BUILD_ROOT INSTALL="%{_bindir}/install -p" +rm $RPM_BUILD_ROOT%{_libdir}/libfo-0.5.la + +%clean +rm -rf $RPM_BUILD_ROOT + +%post -n libfo -p /sbin/ldconfig + +%postun -n libfo -p /sbin/ldconfig + +%files +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog COPYING NEWS README TODO +%{_bindir}/%{name} +%dir %{_datadir}/gtk-doc/html/%{name} +%{_datadir}/gtk-doc/html/%{name}/*.html +%{_datadir}/gtk-doc/html/%{name}/*.css +%{_datadir}/gtk-doc/html/%{name}/*.png +%{_datadir}/gtk-doc/html/%{name}/*.sgml +%{_datadir}/xml/libfo-0.5.2/%{name}.* + +%files -n libfo +%defattr(-,root,root,-) +%doc AUTHORS ChangeLog COPYING NEWS TODO +%dir %{_datadir}/xml/libfo-0.5.2 +%{_datadir}/xml/libfo-0.5.2/catalog.xml +%{_datadir}/xml/libfo-0.5.2/libfo-compat.xsl +%{_libdir}/libfo-0.5.so.* + +%files -n libfo-devel +%defattr(-,root,root,-) +%{_datadir}/gtk-doc/html/%{name}/%{name}.devhelp* +%{_includedir}/libfo-0.5 +%{_libdir}/libfo-0.5.so +%{_libdir}/pkgconfig/libfo-0.5.pc + +%changelog +* Fri Nov 9 2007 Ignacio Vazquez-Abrams 0.5.2-4 +- Added requirement of libxml2-devel in libfo-devel + +* Sat Nov 3 2007 Ignacio Vazquez-Abrams 0.5.2-3 +- Removed requirement of libxslt-devel in libfo-devel + +* Wed Oct 24 2007 Ignacio Vazquez-Abrams 0.5.2-2 +- Added libfo as requirement to xmlroff +- Added calls to ldconfig +- Added documents to libfo +- Added xml-common as requirement to libfo +- Added make argument to preserve timestamps +- Moved .pc file to libfo-devel + +* Tue Aug 28 2007 Ignacio Vazquez-Abrams 0.5.2-1 +- Initial RPM release