Hello community,
here is the log from the commit of package popt for openSUSE:Factory checked in
at 2012-02-15 16:17:42
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/popt (Old)
and /work/SRC/openSUSE:Factory/.popt.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "popt", Maintainer is "m...@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/popt/popt.changes 2011-10-21
16:34:47.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.popt.new/popt.changes 2012-02-15
16:17:47.000000000 +0100
@@ -1,0 +2,5 @@
+Sun Feb 12 21:38:30 UTC 2012 - crrodrig...@opensuse.org
+
+- Libraries back into %{_libdir}, /usr merge project.
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ popt.spec ++++++
--- /var/tmp/diff_new_pack.SqyAm8/_old 2012-02-15 16:17:48.000000000 +0100
+++ /var/tmp/diff_new_pack.SqyAm8/_new 2012-02-15 16:17:48.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package popt
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,19 +16,18 @@
#
-
Name: popt
Version: 1.16
-Release: 7
+Release: 0
#!BuildIgnore: rpmlint-Factory
-License: MIT
Summary: A C library for parsing command line parameters
+License: MIT
Group: System Environment/Libraries
-URL: http://www.rpm5.org/
+Url: http://www.rpm5.org/
Source: popt-%{version}.tar.bz2
Source2: baselibs.conf
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: pkgconfig
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
Popt is a C library for parsing command line parameters. Popt was
@@ -40,10 +39,9 @@
parsing arbitrary strings into argv[] arrays using shell-like rules.
%package -n libpopt0
-License: MIT
Summary: A C library for parsing command line parameters
Group: System Environment/Libraries
-Provides: popt = %{version}-%{release}
+Provides: popt = %{version}
Obsoletes: popt < %{version}
%description -n libpopt0
@@ -56,7 +54,6 @@
parsing arbitrary strings into argv[] arrays using shell-like rules.
%package devel
-License: MIT
Summary: Development files for the popt library
Group: Development/Libraries
Requires: libpopt0 = %{version}
@@ -68,37 +65,37 @@
%prep
%setup -q
-
%build
-%configure --libdir=/%{_lib} --disable-static
+%configure --with-pic --disable-static
make %{?_smp_mflags}
%install
-make DESTDIR=$RPM_BUILD_ROOT install
-rm -f $RPM_BUILD_ROOT/%_lib/libpopt.a
-rm -f $RPM_BUILD_ROOT/%_lib/libpopt.la
+%make_install
+rm %{buildroot}%{_libdir}/libpopt.la
+
%if "%{_libdir}" != "%{_prefix}/lib"
install -d -m755 %{buildroot}/%{_libdir}/pkgconfig
mv %{buildroot}%{_prefix}/lib/pkgconfig/%{name}.pc
%{buildroot}/%{_libdir}/pkgconfig/%{name}.pc
%endif
-%find_lang %name
+
+%find_lang %{name}
%clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
%post -n libpopt0 -p /sbin/ldconfig
%postun -n libpopt0 -p /sbin/ldconfig
-%files -n libpopt0 -f %name.lang
+%files -n libpopt0 -f %{name}.lang
%defattr(-,root,root)
%doc CHANGES COPYING
-/%{_lib}/libpopt.so.*
+%{_libdir}/libpopt.so.*
%files devel
%defattr(-,root,root)
%doc README
-/%{_lib}/libpopt.so
+%{_libdir}/libpopt.so
%{_includedir}/popt.h
%{_mandir}/man3/popt.3*
%{_libdir}/pkgconfig/popt.pc
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
