[f-spot] Change paths for mono assemblies according to updated packaging guidelines (http://fedoraproject.org
Christian Krause
chkr at fedoraproject.org
Mon Oct 31 20:00:31 UTC 2011
commit e3dacc72800a2d5a6eccada7b6eae4d701099a20
Author: Christian Krause <chkr at fedoraproject.org>
Date: Mon Oct 31 21:00:19 2011 +0100
Change paths for mono assemblies according to updated packaging
guidelines (http://fedoraproject.org/wiki/Packaging:Mono)
f-spot.spec | 33 ++++++++++++++++++---------------
1 files changed, 18 insertions(+), 15 deletions(-)
---
diff --git a/f-spot.spec b/f-spot.spec
index 826312b..2505afd 100644
--- a/f-spot.spec
+++ b/f-spot.spec
@@ -1,6 +1,6 @@
Name: f-spot
Version: 0.8.2
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: Photo management application
Group: Applications/Multimedia
@@ -81,17 +81,16 @@ photo collection in a slideshow as a screensaver.
%build
export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir}
-%configure --disable-scrollkeeper --disable-static
+%configure --disable-scrollkeeper --disable-static --libdir=%{_prefix}/lib
make V=1 %{?_smp_mflags}
%install
-rm -rf $RPM_BUILD_ROOT
export MONO_SHARED_DIR=%{_builddir}/%{?buildsubdir}
make install DESTDIR=$RPM_BUILD_ROOT INSTALL="/usr/bin/install -p"
find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';'
-rm $RPM_BUILD_ROOT%{_libdir}/pkgconfig/f-spot.pc
+rm $RPM_BUILD_ROOT%{_prefix}/lib/pkgconfig/f-spot.pc
# only files marked executable are used to auto-generate the
# requires/provides of the package
@@ -137,27 +136,31 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
%{_datadir}/gnome/help/f-spot/
%{_datadir}/icons/hicolor/*/*/*.png
%{_datadir}/f-spot/
-%dir %{_libdir}/f-spot/
-%{_libdir}/f-spot/*.dll
-%{_libdir}/f-spot/*.exe
-%{_libdir}/f-spot/*.addins
-%{_libdir}/f-spot/*.config
-%{_libdir}/f-spot/*.mdb
-%{_libdir}/f-spot/*.so
-%{_libdir}/f-spot/*.so.*
-%exclude %{_libdir}/f-spot/Extensions/FSpot.Tools.ScreensaverConfig.dll*
-%{_libdir}/f-spot/Extensions/
+%dir %{_prefix}/lib/f-spot/
+%{_prefix}/lib/f-spot/*.dll
+%{_prefix}/lib/f-spot/*.exe
+%{_prefix}/lib/f-spot/*.addins
+%{_prefix}/lib/f-spot/*.config
+%{_prefix}/lib/f-spot/*.mdb
+%{_prefix}/lib/f-spot/*.so
+%{_prefix}/lib/f-spot/*.so.*
+%exclude %{_prefix}/lib/f-spot/Extensions/FSpot.Tools.ScreensaverConfig.dll*
+%{_prefix}/lib/f-spot/Extensions/
%{_bindir}/f-spot
%{_bindir}/f-spot-import
%{_bindir}/f-spot-sqlite-upgrade
%files screensaver
%defattr(-,root,root,-)
-%{_libdir}/f-spot/Extensions/FSpot.Tools.ScreensaverConfig.dll
+%{_prefix}/lib/f-spot/Extensions/FSpot.Tools.ScreensaverConfig.dll
%{_prefix}/libexec/gnome-screensaver/f-spot-screensaver
%{_datadir}/applications/screensavers/f-spot-screensaver.desktop
%changelog
+* Mon Oct 31 2011 Christian Krause <chkr at fedoraproject.org> - 0.8.2-4
+- Change paths for mono assemblies according to updated packaging
+ guidelines (http://fedoraproject.org/wiki/Packaging:Mono)
+
* Sun Jul 03 2011 Christian Krause <chkr at fedoraproject.org> - 0.8.2-3
- Rebuilt for FTBFS (BZ 715807)
More information about the scm-commits
mailing list