From 1c6b0282d9c7da88c1461f611bf455d2956a21f7 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Feb 11 2015 15:18:52 +0000 Subject: Fix use of temp files (rhbz#840183), minor other cleanups --- diff --git a/libgpod.spec b/libgpod.spec index 9e1f7d9..0ed7602 100644 --- a/libgpod.spec +++ b/libgpod.spec @@ -106,7 +106,6 @@ library. %package sharp-devel Summary: Development files for libgpod-sharp -Summary: C#/.NET library to access iPod content Group: Development/Languages Requires: %{name}-sharp%{?_isa} = %{version}-%{release} @@ -131,8 +130,8 @@ chmod -x bindings/python/examples/*.py %build -%configure --without-hal --enable-udev --with-temp-mount-dir=%{_localstatedir}/run/%{name} -make %{?_smp_mflags} +%configure --without-hal --enable-udev --with-temp-mount-dir=/run/%{name} +make %{?_smp_mflags} V=1 %install @@ -152,13 +151,17 @@ chmod -x %{buildroot}/%{_libdir}/%{name}/*.dll.config rm -f %{buildroot}/%{_libdir}/pkgconfig/%{name}-sharp.pc %endif -%if 0%{?fedora} >= 15 # Setup tmpfiles.d config -mkdir -p %{buildroot}%{_sysconfdir}/tmpfiles.d -echo "D /var/run/%{name} 0755 root root -" > \ - %{buildroot}%{_sysconfdir}/tmpfiles.d/%{name}.conf -%endif +mkdir -p %{buildroot}%{_tmpfilesdir} +echo "D /var/run/%{name} 0644 root root -" > \ + %{buildroot}%{_tmpfilesdir}/%{name}.conf + +mkdir -p %{buildroot}/run +install -d -m 0755 %{buildroot}/run/%{name}/ +# remove static libs and libtool archives +find %{buildroot} -type f -name "*.la" -delete +find %{buildroot} -type f -name "*.a" -delete %post -p /sbin/ldconfig %postun -p /sbin/ldconfig @@ -168,10 +171,10 @@ echo "D /var/run/%{name} 0755 root root -" > \ %{!?_licensedir:%global license %%doc} %license COPYING %doc AUTHORS ChangeLog NEWS README* -%config(noreplace) %{_sysconfdir}/tmpfiles.d/%{name}.conf %{_bindir}/* %{_libdir}/*.so.* -%dir %{_localstatedir}/run/%{name} +%dir /run/%{name}/ +%{_tmpfilesdir}/%{name}.conf /lib/udev/iphone-set-info /lib/udev/ipod-set-info /lib/udev/rules.d/*.rules @@ -180,8 +183,6 @@ echo "D /var/run/%{name} 0755 root root -" > \ %files devel %{_includedir}/gpod-1.0/ %{_libdir}/pkgconfig/%{name}-1.0.pc -%exclude %{_libdir}/*.a -%exclude %{_libdir}/*.la %{_libdir}/*.so @@ -192,7 +193,6 @@ echo "D /var/run/%{name} 0755 root root -" > \ %files -n python-gpod %doc COPYING bindings/python/README bindings/python/examples %{python_sitearch}/gpod -%exclude %{python_sitearch}/gpod/*.la %if %{with_mono} @@ -208,6 +208,7 @@ echo "D /var/run/%{name} 0755 root root -" > \ * Wed Feb 11 2015 Peter Robinson 0.8.3-8 - Rebuild (libimobiledevice) - Use %%license +- Fix use of temp files (rhbz#840183) * Sun Nov 16 2014 Dan HorĂ¡k - 0.8.3-7 - switch to mono_arches