Hello community,
here is the log from the commit of package f-spot
checked in at Sun Feb 4 18:21:43 CET 2007.
--------
--- GNOME/f-spot/f-spot.changes 2007-01-16 17:14:42.000000000 +0100
+++ /mounts/work_src_done/STABLE/f-spot/f-spot.changes 2007-02-02 16:27:24.000000000 +0100
@@ -1,0 +2,6 @@
+Fri Feb 2 16:27:01 CET 2007 - sbrabec@suse.cz
+
+- Removed references to /opt/gnome.
+- Spec file cleanup.
+
+-------------------------------------------------------------------
Old:
----
f-spot-po.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ f-spot.spec ++++++
--- /var/tmp/diff_new_pack.sH5431/_old 2007-02-04 18:21:15.000000000 +0100
+++ /var/tmp/diff_new_pack.sH5431/_new 2007-02-04 18:21:15.000000000 +0100
@@ -15,25 +15,22 @@
%if %suse_version > 1010
BuildRequires: libgphoto2-devel
%endif
-%define prefix /usr
-%define gnomeprefix /opt/gnome
-%define sysconfdir /etc/opt/gnome
License: GNU General Public License (GPL)
Group: Productivity/Graphics/Viewers
Autoreqprov: on
Requires: dcraw
Version: 0.3.1
-Release: 2
+Release: 3
Summary: GNOME Photo Management Application
URL: http://www.gnome.org/projects/f-spot/
Source: %{name}-%{version}.tar.bz2
-Source1: f-spot-po.tar.bz2
Patch: %{name}-64bit-warn.patch
Patch1: %{name}-libexif-so.patch
Patch2: %{name}-configure.patch
Patch3: %{name}-ppc.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: mono-core nautilus-cd-burner dbus-1-x11 libgphoto2
+Provides: %{name}-devel = %{version}-%{release}
%description
F-Spot is an application designed to provide personal photo management
@@ -53,53 +50,30 @@
Federico Mena Quintero
%prep
-if %version != 0.2.1 ; then
-echo "Please remove Source1 and verify, that translations work."
-exit 1
-fi
-%setup -a1
+%setup -q
%patch -p1
%patch1 -p1
%patch2
%patch3
%build
-rename no nb po/no.*
-sed "s/\(ALL_LINGUAS.*\) no /\1 nb /" configure.in > configure.in.tmp && \
- mv configure.in.tmp configure.in
-libtoolize -f
-aclocal -I .
-autoconf
-automake
+autoreconf -f -i
%if %suse_version > 1000
-RPM_OPT_FLAGS="$RPM_OPT_FLAGS -fstack-protector"
+export CFLAGS="$RPM_OPT_FLAGS -fstack-protector"
%endif
-CFLAGS="$RPM_OPT_FLAGS" \
- ./configure \
- --prefix=%prefix \
- --libdir=%prefix/%_lib \
- --libexecdir=%prefix/%_lib/f-spot \
- --sysconfdir=%sysconfdir \
- --datadir=%prefix/share \
- --localstatedir=/var/%_lib \
- --with-kde-datadir=/opt/kde3/share \
- --with-gnome-screensaver=/opt/gnome
-make
+%configure\
+ --libexecdir=%{_prefix}/lib/f-spot
+make %{?jobs:-j%jobs}
%install
-export GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1
-make install DESTDIR=$RPM_BUILD_ROOT
-unset GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL
-mkdir -p $RPM_BUILD_ROOT%{gnomeprefix}/share
-mv $RPM_BUILD_ROOT%{prefix}/share/icons $RPM_BUILD_ROOT%{gnomeprefix}/share/
-mv $RPM_BUILD_ROOT%{prefix}/share/gnome $RPM_BUILD_ROOT%{gnomeprefix}/share/
+%makeinstall
%find_lang %{name}
+mkdir $RPM_BUILD_ROOT%{_datadir}/pixmaps
+ln -s ../icons/hicolor/48x48/apps/f-spot.png $RPM_BUILD_ROOT%{_datadir}/pixmaps/
+mv $RPM_BUILD_ROOT%{_datadir}/gnome-screensaver/themes $RPM_BUILD_ROOT%{_datadir}/applications/screensavers
+rmdir $RPM_BUILD_ROOT%{_datadir}/gnome-screensaver
%suse_update_desktop_file -C "Organize digital photographs" -G "Photo Browser" -N "F-Spot" %{name}
-rm $RPM_BUILD_ROOT/%{_libdir}/f-spot/*.*a
-
-%post
-%run_ldconfig
-export GCONF_CONFIG_SOURCE=`opt/gnome/bin/gconftool-2 --get-default-source`
+rm $RPM_BUILD_ROOT%{_libdir}/*/*.*a
%clean
rm -rf $RPM_BUILD_ROOT
@@ -107,33 +81,19 @@
%files -f %{name}.lang
%defattr(-, root, root)
%doc AUTHORS NEWS README COPYING
-%{prefix}/bin/f-spot
-%{prefix}/bin/f-spot-import
-%dir %{prefix}/%_lib/f-spot
-%{prefix}/%_lib/f-spot/*
-%{prefix}/share/applications/f-spot.desktop
-%{prefix}/share/applications/f-spot-view.desktop
-%{gnomeprefix}/share/icons/hicolor/16x16/apps/f-spot.png
-%{gnomeprefix}/share/icons/hicolor/16x16/apps/f-spot.svg
-%{gnomeprefix}/share/icons/hicolor/22x22/apps/f-spot.png
-%{gnomeprefix}/share/icons/hicolor/22x22/apps/f-spot.svg
-%{gnomeprefix}/share/icons/hicolor/24x24/apps/f-spot.png
-%{gnomeprefix}/share/icons/hicolor/32x32/apps/f-spot.png
-%{gnomeprefix}/share/icons/hicolor/32x32/apps/f-spot.svg
-%{gnomeprefix}/share/icons/hicolor/48x48/apps/f-spot.png
-%{gnomeprefix}/share/icons/hicolor/48x48/apps/f-spot.svg
-%{gnomeprefix}/share/icons/hicolor/scalable/apps/f-spot.svg
-%{gnomeprefix}/share/gnome/help/f-spot/C/*
-%{prefix}/%_lib/pkgconfig/f-spot.pc
-/opt/gnome/lib/gnome-screensaver/gnome-screensaver/f-spot-screensaver
-%dir /opt/gnome/share/gnome-screensaver/themes
-/opt/gnome/share/gnome-screensaver/themes/f-spot-screensaver.desktop
-%if %suse_version < 931
-%dir /usr/share/locale/rw
-%dir /usr/share/locale/rw/LC_MESSAGES
-%endif
+%{_bindir}/*
+%{_libdir}/f-spot
+%{_datadir}/applications/*.desktop
+%{_datadir}/applications/screensavers/*.desktop
+%{_datadir}/icons/hicolor/*/*/*.*
+%{_datadir}/pixmaps/*.png
+%{_libdir}/pkgconfig/*.pc
+%{_prefix}/lib/gnome-screensaver/gnome-screensaver/*
%changelog -n f-spot
+* Fri Feb 02 2007 - sbrabec@suse.cz
+- Removed references to /opt/gnome.
+- Spec file cleanup.
* Tue Jan 16 2007 - lewing@suse.de
- Small patch to make fix the build for ppc. Fixes #235418
* Mon Jan 15 2007 - lewing@suse.de
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org
