Accepting request 77392 from home:elvigia:branches:devel:libraries:c_c++
- Rework build of this package in a sane way. - Fix broken requires,provides,Obsoletes causing "have choice.." build system errors - Remove all "la" files since they are no longer needed - Fix -devel pacakge requires and messed up -config scripts this may cause build fails of already broken dependant packages that do not link all the needed libraries in an explicit manner (This is not a bug here, it is expected to cause it) OBS-URL: https://build.opensuse.org/request/show/77392 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libxslt?expand=0&rev=12
This commit is contained in:
Ismail Dönmez
Git OBS Bridge
parent
06c736d2b1
commit
756de289e8
21
libxslt-config-fixes.patch
Normal file
21
libxslt-config-fixes.patch
Normal file
@ -0,0 +1,21 @@
|
||||
--- xslt-config.in.orig
|
||||
+++ xslt-config.in
|
||||
@@ -89,7 +89,7 @@ while test $# -gt 0; do
|
||||
shift
|
||||
done
|
||||
|
||||
-the_libs="@XSLT_LIBDIR@ @XSLT_LIBS@"
|
||||
+the_libs="-lxslt"
|
||||
if test "$includedir" != "/usr/include"; then
|
||||
the_flags="$the_flags -I$includedir `@XML_CONFIG@ --cflags`"
|
||||
else
|
||||
--- xsltConf.sh.in.orig
|
||||
+++ xsltConf.sh.in
|
||||
@@ -2,6 +2,6 @@
|
||||
# Configuration file for using the xslt library
|
||||
#
|
||||
XSLT_LIBDIR="@XSLT_LIBDIR@"
|
||||
-XSLT_LIBS="@XSLT_LIBS@"
|
||||
+XSLT_LIBS="-lxslt"
|
||||
XSLT_INCLUDEDIR="@XSLT_INCLUDEDIR@"
|
||||
MODULE_VERSION="xslt-@VERSION@"
|
||||
@ -1,3 +1,8 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Jul 29 03:46:57 UTC 2011 - crrodriguez@opensuse.org
|
||||
|
||||
- Rework build of this package in a sane way.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jul 21 13:19:36 UTC 2010 - puzel@novell.com
|
||||
|
||||
|
||||
@ -19,7 +19,10 @@
|
||||
|
||||
|
||||
Name: libxslt-python
|
||||
BuildRequires: libxml2-python libxslt-devel python-devel
|
||||
BuildRequires: libxml2-python python-devel
|
||||
BuildRequires: libgcrypt-devel
|
||||
BuildRequires: libgpg-error-devel
|
||||
BuildRequires: libxml2-devel
|
||||
Summary: Python Bindings for libxslt
|
||||
Version: 1.1.26
|
||||
Release: 1
|
||||
@ -31,8 +34,8 @@ Source: libxslt-%{version}.tar.bz2
|
||||
Patch0: libxslt-1.1.24-linkflags.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
%{py_requires}
|
||||
Requires: libxml2 >= 2.6.27
|
||||
Url: http://xmlsoft.org/XSLT/
|
||||
#BuildArch: noarch
|
||||
|
||||
%description
|
||||
The libxslt-python package contains a module that permits applications
|
||||
@ -56,33 +59,28 @@ Authors:
|
||||
|
||||
%build
|
||||
autoreconf --force --install
|
||||
CFLAGS="$RPM_OPT_FLAGS -fno-strict-aliasing" \
|
||||
%configure
|
||||
# use libxslt as built by libxslt source package
|
||||
mkdir libxslt/.libs libexslt/.libs
|
||||
cp -v %{_libdir}/libxslt.la libxslt
|
||||
cp -v %{_libdir}/libexslt.la libexslt
|
||||
make -C python
|
||||
%configure --with-python --with-pic --disable-static
|
||||
make %{?_smp_mflags} PYTHON_SITE_PACKAGES=%{py_sitedir} pythondir=%{py_sitedir}
|
||||
|
||||
%install
|
||||
export RPM_BUILD_ROOT
|
||||
make -C python install \
|
||||
DESTDIR=$RPM_BUILD_ROOT \
|
||||
pythondir=%{py_sitedir} \
|
||||
PYTHON_SITE_PACKAGES=%{py_sitedir}
|
||||
make install PYTHON_SITE_PACKAGES=%{py_sitedir} pythondir=%{py_sitedir} DESTDIR=$RPM_BUILD_ROOT
|
||||
# Unwanted doc stuff
|
||||
rm -fr $RPM_BUILD_ROOT%{_datadir}/doc
|
||||
# #223696
|
||||
rm -f $RPM_BUILD_ROOT%{py_sitedir}/*.{la,a}
|
||||
|
||||
find %{buildroot} -type f -name "*.la" -print -delete
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%files
|
||||
%defattr(-, root, root)
|
||||
%exclude %{_bindir}/*
|
||||
%exclude %{_libdir}/lib**
|
||||
%exclude %{_includedir}/*
|
||||
%exclude %{_mandir}/*
|
||||
%exclude %{_libdir}/pkgconfig/*
|
||||
%exclude %{_libdir}/xsltConf.sh
|
||||
%exclude /usr/share/aclocal/libxslt.m4
|
||||
%{py_sitedir}/*
|
||||
# %{python_sitepath}/libxslt.py
|
||||
# %{python_sitepath}/libxsltmod.so
|
||||
%doc python/TODO
|
||||
%doc python/libxslt-python-api.xml
|
||||
%doc python/tests/*.py
|
||||
|
||||
@ -1,3 +1,14 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Jul 29 01:53:38 UTC 2011 - crrodriguez@opensuse.org
|
||||
|
||||
- Fix broken requires,provides,Obsoletes causing "have choice.."
|
||||
build system errors
|
||||
- Remove all "la" files since they are no longer needed
|
||||
- Fix -devel pacakge requires and messed up -config scripts
|
||||
this may cause build fails of already broken dependant packages
|
||||
that do not link all the needed libraries in an explicit manner
|
||||
(This is not a bug here, it is expected to cause it)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Jul 27 09:14:25 UTC 2011 - giecrilj@stegny.2a.pl
|
||||
|
||||
|
||||
28
libxslt.spec
28
libxslt.spec
@ -22,9 +22,7 @@ Release: 1
|
||||
License: MIT License (or similar)
|
||||
Summary: XSL Transformation Library
|
||||
Group: System/Libraries
|
||||
BuildRequires: libgcrypt
|
||||
BuildRequires: libgcrypt-devel
|
||||
BuildRequires: libgpg-error
|
||||
BuildRequires: libgpg-error-devel
|
||||
BuildRequires: pkg-config
|
||||
BuildRequires: pkgconfig(libxml-2.0)
|
||||
@ -38,7 +36,7 @@ Source: %{name}-%{version}.tar.bz2
|
||||
Source2: baselibs.conf
|
||||
Source3: xslt-config.1.gz
|
||||
Patch0: %{name}-1.1.24-no-net-autobuild.patch
|
||||
Requires: libxml2 >= 2.6.27
|
||||
Patch1: libxslt-config-fixes.patch
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
|
||||
%description
|
||||
@ -59,8 +57,9 @@ engine.
|
||||
|
||||
%package -n %{name}1
|
||||
Summary: XSL Transformation Library
|
||||
Provides: libxslt
|
||||
Provides: xsltproc
|
||||
Provides: libxslt = %{version}
|
||||
Obsoletes: %{name} < %{version}
|
||||
Provides: xsltproc = %{version}
|
||||
|
||||
%description -n libxslt1
|
||||
This C library allows you to transform XML files into other XML files
|
||||
@ -86,13 +85,9 @@ Group: Development/Libraries/C and C++
|
||||
%ifarch ppc64
|
||||
Obsoletes: libxslt-devel-64bit
|
||||
%endif
|
||||
#
|
||||
Requires: %{name} = %{version}
|
||||
Requires: %{name}1 = %{version}
|
||||
Requires: glibc-devel
|
||||
Requires: libgcrypt-devel
|
||||
Requires: libgpg-error-devel
|
||||
Requires: pkg-config
|
||||
Requires: pkgconfig(libxml-2.0) >= 2.6.27
|
||||
#libxml is automatically required with pkgconfig
|
||||
|
||||
%description devel
|
||||
This package contains all necessary include files and libraries needed
|
||||
@ -101,10 +96,9 @@ to develop applications that require these.
|
||||
%prep
|
||||
%setup -q
|
||||
%patch0
|
||||
|
||||
%patch1
|
||||
%build
|
||||
autoreconf --force --install
|
||||
CFLAGS="%{optflags} -fno-strict-aliasing" \
|
||||
%configure --disable-static --with-pic --without-python
|
||||
make %{?_smp_mflags}
|
||||
|
||||
@ -115,13 +109,10 @@ make check
|
||||
%make_install
|
||||
# Unwanted doc stuff
|
||||
rm -fr %{buildroot}%{_datadir}/doc
|
||||
%if 0
|
||||
# libxslt-python uses these
|
||||
rm -f %{buildroot}%{_libdir}/*.la
|
||||
%endif
|
||||
# the manual page is required
|
||||
install -ma=r '-t%{buildroot}%{_mandir}/man1' '%{SOURCE3}'
|
||||
|
||||
#kill all "la" files
|
||||
find %{buildroot} -type f -name "*.la" -print -delete
|
||||
%clean
|
||||
rm -rf %{buildroot}
|
||||
|
||||
@ -141,7 +132,6 @@ rm -rf %{buildroot}
|
||||
%{_libdir}/lib*.so
|
||||
%{_libdir}/*.sh
|
||||
%{_libdir}/pkgconfig/*.pc
|
||||
%{_libdir}/lib*.la
|
||||
%{_includedir}/*
|
||||
%{_datadir}/aclocal/*
|
||||
%{_bindir}/xslt-config
|
||||
|
||||
Loading…
Reference in New Issue
Block a user