Hello community,
here is the log from the commit of package gtkam
checked in at Wed Feb 7 00:30:55 CET 2007.
--------
--- GNOME/gtkam/gtkam.changes 2007-01-12 14:04:54.000000000 +0100
+++ /mounts/work_src_done/STABLE/gtkam/gtkam.changes 2007-02-06 17:44:43.000000000 +0100
@@ -1,0 +2,6 @@
+Tue Feb 6 17:44:27 CET 2007 - sbrabec@suse.cz
+
+- Spec file cleanup.
+- Package gexif in a separate package.
+
+-------------------------------------------------------------------
Old:
----
gexif-0.5.tar.bz2
gexif-0.5-xx.patch
gtkam.desktop
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ gtkam.spec ++++++
--- /var/tmp/diff_new_pack.V22325/_old 2007-02-07 00:30:47.000000000 +0100
+++ /var/tmp/diff_new_pack.V22325/_new 2007-02-07 00:30:47.000000000 +0100
@@ -11,19 +11,17 @@
# norootforbuild
Name: gtkam
-BuildRequires: docbook-xsl-stylesheets gdk-pixbuf-devel gimp-devel gnutls-devel libexif-gtk libglade2-devel libgnomeprintui-devel libgnomeui-devel libgphoto2-devel libwnck-devel mDNSResponder-devel scrollkeeper sgml-skel update-desktop-files
+BuildRequires: gimp-devel libexif-gtk libgnomeui-devel libgphoto2-devel update-desktop-files
+# FIXME: Only for /usr/share/omf directory ownership
+BuildRequires: scrollkeeper
License: GNU General Public License (GPL)
Group: Hardware/Other
Summary: A GTK Digital Camera Tool
Version: 0.1.14.0.trunk
-Release: 1
-Source: gtkam-%{version}.tar.bz2
-Source1: gexif-0.5.tar.bz2
-Source2: %name.desktop
-Patch0: gexif-0.5-xx.patch
+Release: 2
+Source: %{name}-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
URL: http://gphoto.org
-%define prefix /usr
%description
GTKam is a GTK and GNOME based tool for accessing a digital camera,
@@ -38,68 +36,44 @@
Colin Marquardt
%prep
-%setup -q -a 1
-%patch0 -p0
-%{?suse_update_config:%{suse_update_config}}
+%setup -q
%build
-CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{prefix} --libdir=%{prefix}/%{_lib} --mandir=%{prefix}/share/man
-# cd po ; make -f Makefile.in Makefile top_builddir=../ ; cd ..
-make top_builddir=`pwd`
-cd gexif-*
- CFLAGS="$RPM_OPT_FLAGS" ./configure --prefix=%{prefix}
- make
-cd ..
+%configure
+make %{?jobs:-j%jobs}
%install
-[ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] && rm -rf $RPM_BUILD_ROOT;
-mkdir -p $RPM_BUILD_ROOT%{prefix}
-make DESTDIR=$RPM_BUILD_ROOT install
-cd gexif-*
- make prefix=$RPM_BUILD_ROOT%{prefix} install
-cd ..
+%makeinstall
# cleanup
-rm -rf $RPM_BUILD_ROOT%{prefix}/share/doc/gtkam
-gzip -9nf $RPM_BUILD_ROOT%{prefix}/share/man/man?/*.?
-%find_lang %name
-%find_lang gexif
-cat gexif.lang >> %{name}.lang
-mkdir -p $RPM_BUILD_ROOT/%prefix/share/applications/
-install -m 0644 %SOURCE2 \
- $RPM_BUILD_ROOT/%prefix/share/applications/
+rm -r $RPM_BUILD_ROOT%{_datadir}/doc/gtkam
%if %suse_version > 1000
-%suse_update_desktop_file %name Graphics Photography
+%suse_update_desktop_file %{name} Graphics Photography
%else
-%suse_update_desktop_file %name Graphics Photograph
+%suse_update_desktop_file %{name} Graphics Photograph
%endif
+%find_lang %{name}
%clean
rm -rf $RPM_BUILD_ROOT;
-%post
-touch var/adm/SuSEconfig/run-scrollkeeper-update
-
-%postun
-touch var/adm/SuSEconfig/run-scrollkeeper-update
-
-%files -f %name.lang
+%files -f %{name}.lang
%defattr(-,root,root)
-%doc AUTHORS README COPYING ChangeLog
-%attr(755,root,root) %{prefix}/bin/gtkam
-%attr(755,root,root) %{prefix}/bin/gexif
-%doc %{prefix}/share/man/man1/*
-%{prefix}/share/gtkam
-%{prefix}/share/applications/%name.desktop
-%{prefix}/share/pixmaps/gtkam.png
-%{prefix}/share/omf/gtkam
-%dir %{prefix}/share/images
-%{prefix}/share/images/gtkam
-%dir %{prefix}/%_lib/gimp/
-%dir %{prefix}/%_lib/gimp/2.0
-%dir %{prefix}/%_lib/gimp/2.0/plug-ins
-%{prefix}/%_lib/gimp/2.0/plug-ins/gtkam-gimp
+%doc AUTHORS ChangeLog CHANGES COPYING NEWS README TODO
+%{_bindir}/gtkam
+%{_datadir}/applications/*.desktop
+%{_datadir}/gtkam
+# FIXME: There is no generic %{_datadir}/images. Better would be %{_datadir}/pixmaps (upstream problem).
+%dir %{_datadir}/images
+%{_datadir}/images/gtkam
+%{_datadir}/omf/gtkam
+%{_datadir}/pixmaps/gtkam.png
+%{_libdir}/gimp/2.0/plug-ins/gtkam-gimp
+%doc %{_mandir}/man1/*.*
%changelog -n gtkam
+* Tue Feb 06 2007 - sbrabec@suse.cz
+- Spec file cleanup.
+- Package gexif in a separate package.
* Fri Jan 12 2007 - meissner@suse.de
- upgraded to 0.1.14.0.trunk
- some capture fixes
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org