SHA256
1
0
forked from pool/popt

Accepting request 104178 from home:elvigia:branches:Base:System

- Libraries back into %{_libdir}, /usr merge project.

OBS-URL: https://build.opensuse.org/request/show/104178
OBS-URL: https://build.opensuse.org/package/show/Base:System/popt?expand=0&rev=28
This commit is contained in:
Cristian Rodríguez 2012-02-12 22:52:37 +00:00 committed by Git OBS Bridge
parent 12cdda404b
commit e87a7a202a
2 changed files with 21 additions and 19 deletions

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Sun Feb 12 21:38:30 UTC 2012 - crrodriguez@opensuse.org
- Libraries back into %{_libdir}, /usr merge project.
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Oct 9 11:09:27 UTC 2011 - jengelh@medozas.de Sun Oct 9 11:09:27 UTC 2011 - jengelh@medozas.de

View File

@ -1,7 +1,7 @@
# #
# spec file for package popt # 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 # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -16,19 +16,18 @@
# #
Name: popt Name: popt
Version: 1.16 Version: 1.16
Release: 7 Release: 0
#!BuildIgnore: rpmlint-Factory #!BuildIgnore: rpmlint-Factory
License: MIT
Summary: A C library for parsing command line parameters Summary: A C library for parsing command line parameters
License: MIT
Group: System Environment/Libraries Group: System Environment/Libraries
URL: http://www.rpm5.org/ Url: http://www.rpm5.org/
Source: popt-%{version}.tar.bz2 Source: popt-%{version}.tar.bz2
Source2: baselibs.conf Source2: baselibs.conf
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description %description
Popt is a C library for parsing command line parameters. Popt was Popt is a C library for parsing command line parameters. Popt was
@ -40,10 +39,9 @@ be aliased via configuration files and includes utility functions for
parsing arbitrary strings into argv[] arrays using shell-like rules. parsing arbitrary strings into argv[] arrays using shell-like rules.
%package -n libpopt0 %package -n libpopt0
License: MIT
Summary: A C library for parsing command line parameters Summary: A C library for parsing command line parameters
Group: System Environment/Libraries Group: System Environment/Libraries
Provides: popt = %{version}-%{release} Provides: popt = %{version}
Obsoletes: popt < %{version} Obsoletes: popt < %{version}
%description -n libpopt0 %description -n libpopt0
@ -56,7 +54,6 @@ be aliased via configuration files and includes utility functions for
parsing arbitrary strings into argv[] arrays using shell-like rules. parsing arbitrary strings into argv[] arrays using shell-like rules.
%package devel %package devel
License: MIT
Summary: Development files for the popt library Summary: Development files for the popt library
Group: Development/Libraries Group: Development/Libraries
Requires: libpopt0 = %{version} Requires: libpopt0 = %{version}
@ -68,37 +65,37 @@ API documentation of the popt library, too.
%prep %prep
%setup -q %setup -q
%build %build
%configure --libdir=/%{_lib} --disable-static %configure --with-pic --disable-static
make %{?_smp_mflags} make %{?_smp_mflags}
%install %install
make DESTDIR=$RPM_BUILD_ROOT install %make_install
rm -f $RPM_BUILD_ROOT/%_lib/libpopt.a rm %{buildroot}%{_libdir}/libpopt.la
rm -f $RPM_BUILD_ROOT/%_lib/libpopt.la
%if "%{_libdir}" != "%{_prefix}/lib" %if "%{_libdir}" != "%{_prefix}/lib"
install -d -m755 %{buildroot}/%{_libdir}/pkgconfig install -d -m755 %{buildroot}/%{_libdir}/pkgconfig
mv %{buildroot}%{_prefix}/lib/pkgconfig/%{name}.pc %{buildroot}/%{_libdir}/pkgconfig/%{name}.pc mv %{buildroot}%{_prefix}/lib/pkgconfig/%{name}.pc %{buildroot}/%{_libdir}/pkgconfig/%{name}.pc
%endif %endif
%find_lang %name
%find_lang %{name}
%clean %clean
rm -rf $RPM_BUILD_ROOT rm -rf %{buildroot}
%post -n libpopt0 -p /sbin/ldconfig %post -n libpopt0 -p /sbin/ldconfig
%postun -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) %defattr(-,root,root)
%doc CHANGES COPYING %doc CHANGES COPYING
/%{_lib}/libpopt.so.* %{_libdir}/libpopt.so.*
%files devel %files devel
%defattr(-,root,root) %defattr(-,root,root)
%doc README %doc README
/%{_lib}/libpopt.so %{_libdir}/libpopt.so
%{_includedir}/popt.h %{_includedir}/popt.h
%{_mandir}/man3/popt.3* %{_mandir}/man3/popt.3*
%{_libdir}/pkgconfig/popt.pc %{_libdir}/pkgconfig/popt.pc