Hello community, here is the log from the commit of package libnl-1_1 for openSUSE:Factory checked in at Mon Sep 19 17:48:17 CEST 2011. -------- --- libnl-1_1/libnl-1_1.changes 2011-09-05 15:08:50.000000000 +0200 +++ libnl-1_1/libnl-1_1.changes 2011-09-15 15:32:49.000000000 +0200 @@ -1,0 +2,24 @@ +Thu Sep 15 13:31:14 UTC 2011 - jengelh@medozas.de + +- Second attempt at getting baselibs.conf more right + +------------------------------------------------------------------- +Wed Sep 14 09:27:34 UTC 2011 - jengelh@medozas.de + +- Remove Conflicts tag, this will be automatically detected + +------------------------------------------------------------------- +Mon Sep 12 07:08:51 UTC 2011 - jengelh@medozas.de + +- Fix up baselibs.conf to name the right packages +- Restore BuildRequires for non-SUSE + +------------------------------------------------------------------- +Wed Sep 7 10:48:01 UTC 2011 - jengelh@medozas.de + +- Disarm %-in-a-comment (rpmlint warning) +- Use %_smp_mflags +- Remove redundant %clean section +- Run spec-beautifier + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libnl-1_1.spec ++++++ --- /var/tmp/diff_new_pack.sl5Bdg/_old 2011-09-19 17:48:10.000000000 +0200 +++ /var/tmp/diff_new_pack.sl5Bdg/_new 2011-09-19 17:48:10.000000000 +0200 @@ -31,11 +31,16 @@ %endif # Url: http://people.suug.ch/~tgr/libnl/ -Source: http://people.suug.ch/~tgr/libnl/files/libnl-%{version}.tar.bz2 +Source: http://people.suug.ch/~tgr/libnl/files/libnl-%version.tar.bz2 Source99: baselibs.conf Patch0: libnl-1.1.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build +%if 0%{?fedora_version} || 0%{?redhat_version} +BuildRequires: pkgconfig +%endif +%if 0%{?suse_version} BuildRequires: pkg-config +%endif Obsoletes: libnl < %version-%release Provides: libnl = %version-%release @@ -44,8 +49,6 @@ kernels netlink sockets interface for network manipulation. %package -n %lname - - Summary: Convenience library for working with Netlink sockets Group: System/Libraries @@ -57,39 +60,35 @@ License: LGPLv2.1+ Summary: Convenience library for kernel netlink sockets Group: Development/Libraries/Other -Requires: %{name} = %{version}-%{release} +Requires: %name = %version-%release # bug437293 %ifarch ppc64 Obsoletes: libnl-devel-64bit %endif # Provides: libnl-devel = %release-%version -Conflicts: otherproviders(libnl-devel) %description devel This package contains a convenience library to simplify using the Linux kernels netlink sockets interface for network manipulation. %prep -%setup -q -n libnl-%{version} +%setup -q -n libnl-%version %patch0 -p1 %build -#%configure -CFLAGS="$RPM_OPT_FLAGS" \ +#%%configure +CFLAGS="%optflags" \ ./configure \ - --prefix=%{_prefix} \ + --prefix=%_prefix \ --libdir=/%_lib \ - --includedir=%{_includedir} -make %{?jobs:-j%jobs} + --includedir=%_includedir +make %{?_smp_mflags} %install %makeinstall -mkdir -p $RPM_BUILD_ROOT/%{_libdir}/pkgconfig -mv $RPM_BUILD_ROOT/%_lib/pkgconfig/* $RPM_BUILD_ROOT/%{_libdir}/pkgconfig - -%clean -rm -rf $RPM_BUILD_ROOT +mkdir -p %buildroot/%_libdir/pkgconfig +mv %buildroot/%_lib/pkgconfig/* %buildroot/%_libdir/pkgconfig %post -p /sbin/ldconfig @@ -102,8 +101,8 @@ %files devel %defattr(-,root,root,0755) -%{_includedir}/netlink/ +%_includedir/netlink/ /%_lib/libnl*.so -%{_libdir}/pkgconfig/*.pc +%_libdir/pkgconfig/*.pc %changelog ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.sl5Bdg/_old 2011-09-19 17:48:10.000000000 +0200 +++ /var/tmp/diff_new_pack.sl5Bdg/_new 2011-09-19 17:48:10.000000000 +0200 @@ -1,4 +1,2 @@ -libnl-1_1-1 -libnl-devel - requires -libnl-<targettype> - requires "libnl-1_1-1-<targettype> = <version>" +libnl-1_1 +libnl-1_1-devel ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org