testing/popt
SHA256
3
0
Fork 0
forked from pool/popt
Code Pull Requests Activity

revert parts that do not make sense and were not

Browse Source 
answered

OBS-URL: https://build.opensuse.org/package/show/Base:System/popt?expand=0&rev=24
This commit is contained in:
Stephan Kulow 2011-03-17 13:03:54 +00:00 committed by Git OBS Bridge
parent d3ae64c4e9
commit 87844ba1a9
2 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
popt.changes
View File

@ -2,8 +2,6 @@
Wed Feb 2 08:35:00 UTC 2011 - andreas.hanke@gmx-topmail.de Wed Feb 2 08:35:00 UTC 2011 - andreas.hanke@gmx-topmail.de
- don't build libpopt.a - don't build libpopt.a
- move libpopt.so from /%{_lib} to %{_libdir} and fix popt.pc to have
libdir=%{_libdir} instead of libdir=/%{_lib}
- don't list popt.mo files twice - don't list popt.mo files twice
------------------------------------------------------------------- -------------------------------------------------------------------

10
popt.spec
View File

@ -69,15 +69,13 @@ API documentation of the popt library, too.
%setup -q %setup -q
%build %build
%configure --disable-static %configure --libdir=/%{_lib} --disable-static
make %{?_smp_mflags} make %{?_smp_mflags}
%install %install
make DESTDIR=$RPM_BUILD_ROOT install make DESTDIR=$RPM_BUILD_ROOT install
rm $RPM_BUILD_ROOT%{_libdir}/libpopt.{la,so} rm -f $RPM_BUILD_ROOT/%_lib/libpopt.a
install -d -m755 $RPM_BUILD_ROOT/%{_lib} rm -f $RPM_BUILD_ROOT/%_lib/libpopt.la
mv $RPM_BUILD_ROOT%{_libdir}/libpopt.so.* $RPM_BUILD_ROOT/%{_lib}
ln -s /%{_lib}/libpopt.so.0 $RPM_BUILD_ROOT%{_libdir}/libpopt.so
%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
@ -99,7 +97,7 @@ rm -rf $RPM_BUILD_ROOT
%files devel %files devel
%defattr(-,root,root) %defattr(-,root,root)
%doc README %doc README
%{_libdir}/libpopt.so /%{_lib}/libpopt.so
%{_includedir}/popt.h %{_includedir}/popt.h
%{_mandir}/man3/popt.3* %{_mandir}/man3/popt.3*
%{_libdir}/pkgconfig/popt.pc %{_libdir}/pkgconfig/popt.pc