From 397c0976ca3784cdca24ae3435ae9bf1b612be4271e60256f14c4469e0264dea Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Tue, 6 Feb 2007 23:30:55 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gtkam?expand=0&rev=2 --- gexif-0.5-xx.patch | 20 ----------- gexif-0.5.tar.bz2 | 3 -- gtkam.changes | 6 ++++ gtkam.desktop | 4 --- gtkam.spec | 82 ++++++++++++++++------------------------------ 5 files changed, 34 insertions(+), 81 deletions(-) delete mode 100644 gexif-0.5-xx.patch delete mode 100644 gexif-0.5.tar.bz2 delete mode 100644 gtkam.desktop diff --git a/gexif-0.5-xx.patch b/gexif-0.5-xx.patch deleted file mode 100644 index 97b8a3a..0000000 --- a/gexif-0.5-xx.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- gexif-0.5/gexif/Makefile.am.xx 2004-04-30 10:31:53.000000000 +0200 -+++ gexif-0.5/gexif/Makefile.am 2004-04-30 10:32:03.000000000 +0200 -@@ -1,7 +1,6 @@ - INCLUDES = \ - -I$(top_srcdir) \ - -I$(top_srcdir)/intl \ -- -DGTK_DISABLE_DEPRECATED \ - -DGEXIF_LOCALEDIR="\"$(datadir)/locale\"" \ - $(GEXIF_CFLAGS) - ---- gexif-0.5/gexif/Makefile.in.xx 2004-04-30 10:31:56.000000000 +0200 -+++ gexif-0.5/gexif/Makefile.in 2004-04-30 10:32:05.000000000 +0200 -@@ -163,7 +163,6 @@ - INCLUDES = \ - -I$(top_srcdir) \ - -I$(top_srcdir)/intl \ -- -DGTK_DISABLE_DEPRECATED \ - -DGEXIF_LOCALEDIR="\"$(datadir)/locale\"" \ - $(GEXIF_CFLAGS) - diff --git a/gexif-0.5.tar.bz2 b/gexif-0.5.tar.bz2 deleted file mode 100644 index 193a3f1..0000000 --- a/gexif-0.5.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:39975650e413f6778fe56533f7e53c9ae48eb0a98e167cb3c5fc1b8dbd399432 -size 326193 diff --git a/gtkam.changes b/gtkam.changes index 2234958..4c46fea 100644 --- a/gtkam.changes +++ b/gtkam.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Feb 6 17:44:27 CET 2007 - sbrabec@suse.cz + +- Spec file cleanup. +- Package gexif in a separate package. + ------------------------------------------------------------------- Fri Jan 12 14:04:13 CET 2007 - meissner@suse.de diff --git a/gtkam.desktop b/gtkam.desktop deleted file mode 100644 index a01388b..0000000 --- a/gtkam.desktop +++ /dev/null @@ -1,4 +0,0 @@ -[Desktop Entry] -Type=Application -Name=gtkam -Exec=gtkam diff --git a/gtkam.spec b/gtkam.spec index ac153cf..0f56152 100644 --- a/gtkam.spec +++ b/gtkam.spec @@ -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 @@ Authors: 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