Hello community, here is the log from the commit of package libapr1 for openSUSE:Factory checked in at 2014-06-25 15:24:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libapr1 (Old) and /work/SRC/openSUSE:Factory/.libapr1.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libapr1" Changes: -------- --- /work/SRC/openSUSE:Factory/libapr1/libapr1.changes 2014-04-26 06:04:52.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.libapr1.new/libapr1.changes 2014-06-25 15:24:18.000000000 +0200 @@ -1,0 +2,24 @@ +Mon Jun 23 14:15:22 UTC 2014 - [email protected] + +- Single thread for tests. + +------------------------------------------------------------------- +Mon Jun 23 07:32:57 UTC 2014 - [email protected] + +- Move plain .so file from devel package to fix tomcat intercation. + bnc#881700 + +------------------------------------------------------------------- +Fri Jun 20 11:46:37 UTC 2014 - [email protected] + +- Remove sparc mentions from baselibs + +------------------------------------------------------------------- +Fri Jun 20 09:03:19 UTC 2014 - [email protected] + +- Cleanup with spec-cleaner +- Remove support for sle9 and friends. +- Fix date and time usage to avoid the completely needless rebuilds +- Run the tests in multiple threads + +------------------------------------------------------------------- @@ -14 +37,0 @@ - ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libapr1.spec ++++++ --- /var/tmp/diff_new_pack.YZcXIh/_old 2014-06-25 15:24:19.000000000 +0200 +++ /var/tmp/diff_new_pack.YZcXIh/_new 2014-06-25 15:24:19.000000000 +0200 @@ -16,42 +16,31 @@ # +%define aprver 1 +%define installbuilddir %{_libdir}/apr-%{aprver}/build +%define includedir %{_includedir}/apr-%{aprver} Name: libapr1 -BuildRequires: libtool -BuildRequires: libuuid-devel -BuildRequires: lksctp-tools-devel -BuildRequires: python -%if %{?suse_version:1}0 -BuildRequires: doxygen -# for the test suite -BuildRequires: netcfg -%endif -%if %{?suse_version:1}0 && 0%{?sles_version} != 9 -BuildRequires: pkg-config -%endif -Url: http://apr.apache.org/ -# bug437293 -%ifarch ppc64 -Obsoletes: libapr1-64bit -%endif -%ifarch %ix86 ppc -Obsoletes: libapr1-32bit -%endif -# Version: 1.5.1 Release: 0 Summary: Apache Portable Runtime (APR) Library License: Apache-2.0 Group: Development/Libraries/Other +Url: http://apr.apache.org/ Source: http://www.apache.org/dist/apr/apr-%{version}.tar.bz2 Source2: baselibs.conf Patch1: string-compare.diff Patch4: apr-1.4.5-linux3.patch Patch5: apr-visibility.patch +BuildRequires: doxygen +BuildRequires: fdupes +BuildRequires: libtool +BuildRequires: libuuid-devel +BuildRequires: lksctp-tools-devel +# for the testsuite +BuildRequires: netcfg +BuildRequires: pkg-config +BuildRequires: python BuildRoot: %{_tmppath}/%{name}-%{version}-build -%define aprver 1 -%define installbuilddir %{_libdir}/apr-%{aprver}/build -%define includedir %{_includedir}/apr-%{aprver} %description The mission of the Apache Portable Runtime (APR) project is to create @@ -71,14 +60,6 @@ Group: Development/Libraries/Other Requires: glibc-devel Requires: libapr1 = %{version} -# bug437293 -%ifarch ppc64 -Obsoletes: libapr1-devel-64bit -%endif -%ifarch %ix86 ppc -Obsoletes: libapr1-devel-32bit -%endif -# %description devel The mission of the Apache Portable Runtime (APR) project is to create @@ -98,55 +79,19 @@ %patch1 %patch4 %patch5 -p1 -# -# workaround for ugly bug 400488 -# Xen kernel on sles9 x86_64 is set up to behave different than all other kernels -# skip sockets test on that platform -ls -l /lib/modules/ ||: -%if 0%{?sles_version} == 9 -%ifarch x86_64 -sed -i '/testsockets/ d' test/abts_tests.h -#sed -i '/testatomic/ d' test/abts_tests.h -%endif -%endif -# -# this test fails on sles9-x86_64, not only in Xen though. -# disable it for a moment to get packages for testing at least... -%if 0%{?sles_version} == 9 -%ifarch x86_64 -sed -i '/testatomic/ d' test/abts_tests.h -%endif -%endif -# -# this test also fails on sles10, both 32 and 64 bit. But only in the OBS. -# Run manually, it works. Must be either Xen- or ulimit-related. (It doesn't -# seem to be possible to increase ulimit -v in the OBS, unfortunately.) -%if 0%{?sles_version} == 10 || %{?centos_version:1}0 -sed -i '/testatomic/ d' test/abts_tests.h -%endif -# -# the following test currently is broken on hppa: -%ifarch hppa -sed -i '/testatomic/ d' test/abts_tests.h -%endif + +# Do not put date to doxy content +sed -i \ + -e '4 iHTML_TIMESTAMP=NO' \ + docs/doxygen.conf %build -# -#rm -rf aclocal.m4 autom4te*.cache -#autoheader -#%if %{?suse_version:1}0 && 0%{?sles_version} != 9 && 0%{?sles_version} != 10 -#autoconf -#%endif -# -# --enable-pool-debug[=yes|no|verbose|verbose-alloc|lifetime|owner|all] ./buildconf export apr_lock_method=USE_PROC_PTHREAD_SERIALIZE -%configure --enable-other-child \ +%configure \ + --enable-other-child \ --with-installbuilddir=%{installbuilddir} \ --includedir=%{includedir} \ -%if %{?build_with_memory_pool_debug:1}0 - --enable-debug --enable-pool-debug=verbose \ -%endif %ifarch %ix86 --enable-nonportable-atomics=yes \ %endif @@ -156,35 +101,30 @@ --enable-posix-shm \ --with-sendfile \ --with-pic -%{__make} %{?jobs:-j%jobs} CFLAGS="$RPM_OPT_FLAGS -fvisibility=hidden -fPIC" -%if %{?suse_version:1}0 -make dox -%endif +make %{?_smp_mflags} CFLAGS="%{optflags} -fvisibility=hidden -fPIC" +make dox %{?_smp_mflags} %install -make install DESTDIR=$RPM_BUILD_ROOT -%if %{?suse_version:1}0 +make DESTDIR=%{buildroot} install -j1 # Move docs to more convenient location mv docs/dox/html html -%endif # Unpackaged files: -%{__rm} -f $RPM_BUILD_ROOT/%{_libdir}/apr.exp -%{__rm} -f %{buildroot}%{_libdir}/libapr-%{aprver}.la +rm -f %{buildroot}/%{_libdir}/apr.exp +rm -f %{buildroot}%{_libdir}/libapr-%{aprver}.la # Trim exported dependecies sed -ri '/^LIBS=/{s,-l(uuid|crypt) ,,g;s/ */ /g}' \ - $RPM_BUILD_ROOT%{_bindir}/apr-%{aprver}-config + %{buildroot}%{_bindir}/apr-%{aprver}-config sed -ri '/^Libs/{s,-l(uuid|crypt) ,,g}' \ - $RPM_BUILD_ROOT%{_libdir}/pkgconfig/apr-%{aprver}.pc + %{buildroot}%{_libdir}/pkgconfig/apr-%{aprver}.pc + +%fdupes %{buildroot} %check %if ! 0%{?qemu_user_space_build} -make check +make check -j1 %endif -%clean -rm -rf $RPM_BUILD_ROOT - %post -p /sbin/ldconfig %postun -p /sbin/ldconfig @@ -195,6 +135,8 @@ %doc LICENSE %doc NOTICE %{_libdir}/libapr-%{aprver}.so.* +# Do NOT move to devel as this is utilized by Tomcat +%{_libdir}/libapr-%{aprver}.so %files devel %defattr(-,root,root) @@ -202,12 +144,9 @@ %doc docs/canonical_filenames.html %doc docs/incomplete_types %doc docs/non_apr_programs -%if %{?suse_version:1}0 %doc html -%endif %doc emacs-mode %{includedir} -%{_libdir}/libapr-%{aprver}.so %{_bindir}/apr-%{aprver}-config %{_libdir}/pkgconfig/apr-%{aprver}.pc %{_libdir}/apr-%{aprver} ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.YZcXIh/_old 2014-06-25 15:24:19.000000000 +0200 +++ /var/tmp/diff_new_pack.YZcXIh/_new 2014-06-25 15:24:19.000000000 +0200 @@ -1,4 +1,2 @@ arch ppc package libapr1 arch ppc package libapr1-devel -arch sparcv9 package libapr1 -arch sparcv9 package libapr1-devel -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
