Hello community,
here is the log from the commit of package libexif-gtk
checked in at Wed Jul 9 18:43:50 CEST 2008.
--------
--- GNOME/libexif-gtk/libexif-gtk.changes 2007-02-27 22:57:53.000000000 +0100
+++ libexif-gtk/libexif-gtk.changes 2008-07-09 17:55:47.014677000 +0200
@@ -1,0 +2,7 @@
+Wed Jul 9 17:45:34 CEST 2008 - sbrabec@suse.cz
+
+- Added patch to get rid references to deprecated
+ exif_tag_get_name() (fixes GPS Latitude).
+- Split package according to shared library packaging policy.
+
+-------------------------------------------------------------------
New:
----
libexif-gtk-no-deprecated.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libexif-gtk.spec ++++++
--- /var/tmp/diff_new_pack.XM6269/_old 2008-07-09 18:43:00.000000000 +0200
+++ /var/tmp/diff_new_pack.XM6269/_new 2008-07-09 18:43:00.000000000 +0200
@@ -1,7 +1,7 @@
#
# spec file for package libexif-gtk (Version 0.3.3)
#
-# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -10,18 +10,22 @@
# norootforbuild
+
Name: libexif-gtk
-BuildRequires: gtk2-devel libexif-devel update-desktop-files
-URL: http://libexif.sourceforge.net/
-License: GNU General Public License (GPL)
-Group: Development/Libraries/C and C++
+BuildRequires: gtk2-devel libexif-devel
+Url: http://libexif.sourceforge.net/
+License: GPL v2 or later
+Group: System/Libraries
Summary: GTK Widgets for Viewing EXIF Information
Version: 0.3.3
-Release: 358
+Release: 492
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source0: %{name}-%{version}.tar.bz2
Patch0: libexif-gtk-deprec.patch
Patch1: libexif-gtk-libexif.patch
+# http://sourceforge.net/tracker/index.php?func=detail&aid=2014281&group_id=12272&atid=312272
+Patch2: libexif-gtk-no-deprecated.patch
+Requires: libexif-gtk4 = %{version}
%description
This library contains GTK widgets for viewing EXIF information within
@@ -34,65 +38,108 @@
Lutz M�ller
Curtis Galloway
+%package -n libexif-gtk4
+License: GPL v2 or later
+Summary: GTK Widgets for Viewing EXIF Information
+Group: System/Libraries
+Requires: %{name} >= %{version}
+
+%description -n libexif-gtk4
+This library contains GTK widgets for viewing EXIF information within
+JPEG images created by some digital cameras.
+
+
+
+Authors:
+--------
+ Lutz M�ller
+ Curtis Galloway
+
+%package devel
+License: GPL v2 or later
+Summary: GTK Widgets for Viewing EXIF Information
+Group: Development/Libraries/C and C++
+Requires: %{name} = %{version} gtk2-devel libexif-devel
+
+%description devel
+This library contains GTK widgets for viewing EXIF information within
+JPEG images created by some digital cameras.
+
+
+
+Authors:
+--------
+ Lutz M�ller
+ Curtis Galloway
+
%prep
%setup -q
%patch0 -p1
%patch1 -p1
+%patch2
%build
-CFLAGS="$CFLAGS $RPM_OPT_FLAGS" \
- ./configure \
- --prefix=/usr \
- --libdir=%{_libdir} \
+%configure\
--disable-static
-make
+make %{?jobs:-j%jobs}
%install
-make DESTDIR=${RPM_BUILD_ROOT}/ install
+%makeinstall
+%find_lang %{name}
-%post
-%run_ldconfig
+%post -p /sbin/ldconfig -n libexif-gtk4
-%postun
-%run_ldconfig
+%postun -p /sbin/ldconfig -n libexif-gtk4
%clean
-rm -rf ${RPM_BUILD_ROOT}
+rm -rf $RPM_BUILD_ROOT
+
+%files -f %{name}.lang
+%defattr(-,root,root)
+# AUTHORS README NEWS are empty
+%doc ChangeLog COPYING
+
+%files -n libexif-gtk4
+%defattr(-,root,root)
+%{_libdir}/*.so.*
-%files
+%files devel
%defattr(-,root,root)
-%doc README AUTHORS INSTALL ChangeLog COPYING
-%{_libdir}/lib*
-%{_libdir}/pkgconfig/*
-/usr/include/*
-/usr/share/locale/*/LC_MESSAGES/libexif-gtk*
+%{_libdir}/*.so
+%{_libdir}/*.*a
+%{_libdir}/pkgconfig/*.pc
+%{_includedir}/libexif-gtk
%changelog
-* Tue Feb 27 2007 - dmueller@suse.de
+* Wed Jul 09 2008 sbrabec@suse.cz
+- Added patch to get rid references to deprecated
+ exif_tag_get_name() (fixes GPS Latitude).
+- Split package according to shared library packaging policy.
+* Wed Feb 28 2007 dmueller@suse.de
- adjust BuildRequires: libexif -> libexif-devel
-* Wed Jan 25 2006 - mls@suse.de
+* Wed Jan 25 2006 mls@suse.de
- converted neededforbuild to BuildRequires
-* Fri Jul 30 2004 - meissner@suse.de
+* Fri Jul 30 2004 meissner@suse.de
- Included patch so it works with libexif 0.6.*
-* Fri Apr 23 2004 - meissner@suse.de
+* Fri Apr 23 2004 meissner@suse.de
- undeprecate, so it compiles.
-* Sat Jan 10 2004 - adrian@suse.de
+* Sat Jan 10 2004 adrian@suse.de
- add %%run_ldconfig
-* Tue May 13 2003 - meissner@suse.de
+* Tue May 13 2003 meissner@suse.de
- Updated to current CVS.
- Package translations too.
-* Thu Jan 16 2003 - ro@suse.de
+* Thu Jan 16 2003 ro@suse.de
- use gtk2-devel-packages in neededforbuild
-* Wed Jan 08 2003 - meissner@suse.de
+* Wed Jan 08 2003 meissner@suse.de
- Updated to 0.3.3 (bugfixes mostly).
-* Mon Nov 18 2002 - meissner@suse.de
+* Mon Nov 18 2002 meissner@suse.de
- Upgraded to 0.3.2 in preparation of gphoto2-2.1.1.
-* Mon Nov 11 2002 - ro@suse.de
+* Tue Nov 12 2002 ro@suse.de
- changed neededforbuild <xshared> to <x-devel-packages>
- changed neededforbuild <xdevel> to <>
-* Wed Jul 24 2002 - meissner@suse.de
+* Wed Jul 24 2002 meissner@suse.de
- Upgraded to 0.3.1, disabled static libraries.
-* Thu Feb 07 2002 - meissner@suse.de
+* Thu Feb 07 2002 meissner@suse.de
- Added xshared to needed_for_build.
-* Tue Feb 05 2002 - meissner@suse.de
+* Tue Feb 05 2002 meissner@suse.de
- GTK widgets for browsing EXIF information. Used by gphoto/gtkam.
++++++ libexif-gtk-no-deprecated.patch ++++++
http://sourceforge.net/tracker/index.php?func=detail&aid=2014281&group_id=12272&atid=312272
================================================================================
--- libexif-gtk/gtk-exif-content-list.c
+++ libexif-gtk/gtk-exif-content-list.c
@@ -262,6 +262,9 @@
gtk_menu_item_set_submenu (GTK_MENU_ITEM (item), smenu);
/* Create a sorted list of tags. */
+ /* UGLY: libexif does not provide API for "all known tags". */
+ /* FIXME: List should offer only tags legal in current IFD */
+ /* FIXME: Code is duplicate of gtk-exif-tag-menu:gtk_exif_tag_menu_new() */
t = n = 0;
memset (tags, 0, sizeof (GtkOptions) * LIST_SIZE);
while ((t < 0xffff) && (n < LIST_SIZE - 2)) {
@@ -273,6 +276,15 @@
}
t++;
}
+ /* These two tags are only two known non-unique IFD spefic tags. */
+ name = exif_tag_get_name_in_ifd (EXIF_TAG_GPS_LATITUDE_REF, EXIF_IFD_GPS);
+ tags[n].option = EXIF_TAG_GPS_LATITUDE_REF;
+ tags[n].name = name;
+ n++;
+ name = exif_tag_get_name_in_ifd (EXIF_TAG_GPS_LATITUDE, EXIF_IFD_GPS);
+ tags[n].option = EXIF_TAG_GPS_LATITUDE;
+ tags[n].name = name;
+ n++;
gtk_options_sort (tags);
g_assert (n > 1);
@@ -428,7 +440,7 @@
gtk_list_store_append (list->priv->store, &iter);
gtk_list_store_set (GTK_LIST_STORE (list->priv->store), &iter,
- NAME_COLUMN, exif_tag_get_name (entry->tag),
+ NAME_COLUMN, exif_tag_get_name_in_ifd (entry->tag, exif_content_get_ifd(entry->parent)),
VALUE_COLUMN, exif_entry_get_value (entry, buf, sizeof(buf)),
ENTRY_COLUMN, entry, -1);
g_signal_emit (list, signals[ENTRY_ADDED], 0, entry);
--- libexif-gtk/gtk-exif-entry-ascii.c
+++ libexif-gtk/gtk-exif-entry-ascii.c
@@ -108,8 +108,8 @@
entry->priv->entry = e;
exif_entry_ref (e);
gtk_exif_entry_construct (GTK_EXIF_ENTRY (entry),
- exif_tag_get_title (e->tag),
- exif_tag_get_description (e->tag));
+ exif_tag_get_title_in_ifd (e->tag, exif_content_get_ifd(e->parent)),
+ exif_tag_get_description_in_ifd (e->tag, exif_content_get_ifd(e->parent)));
widget = gtk_entry_new ();
gtk_widget_show (widget);
--- libexif-gtk/gtk-exif-entry-copyright.c
+++ libexif-gtk/gtk-exif-entry-copyright.c
@@ -143,8 +143,8 @@
entry->priv->entry = e;
exif_entry_ref (e);
gtk_exif_entry_construct (GTK_EXIF_ENTRY (entry),
- exif_tag_get_title (e->tag),
- exif_tag_get_description (e->tag));
+ exif_tag_get_title_in_ifd (e->tag, exif_content_get_ifd(e->parent)),
+ exif_tag_get_description_in_ifd (e->tag, exif_content_get_ifd(e->parent)));
table = gtk_table_new (2, 2, FALSE);
gtk_widget_show (table);
--- libexif-gtk/gtk-exif-entry-date.c
+++ libexif-gtk/gtk-exif-entry-date.c
@@ -186,8 +186,8 @@
entry->priv->entry = e;
exif_entry_ref (e);
gtk_exif_entry_construct (GTK_EXIF_ENTRY (entry),
- exif_tag_get_title (e->tag),
- exif_tag_get_description (e->tag));
+ exif_tag_get_title_in_ifd (e->tag, exif_content_get_ifd(e->parent)),
+ exif_tag_get_description_in_ifd (e->tag, exif_content_get_ifd(e->parent)));
c = gtk_calendar_new ();
gtk_widget_show (c);
--- libexif-gtk/gtk-exif-entry-exposure.c
+++ libexif-gtk/gtk-exif-entry-exposure.c
@@ -171,8 +171,8 @@
entry->priv->entry = e;
exif_entry_ref (e);
gtk_exif_entry_construct (GTK_EXIF_ENTRY (entry),
- exif_tag_get_title (e->tag),
- exif_tag_get_description (e->tag));
+ exif_tag_get_title_in_ifd (e->tag, exif_content_get_ifd(e->parent)),
+ exif_tag_get_description_in_ifd (e->tag, exif_content_get_ifd(e->parent)));
hbox = gtk_hbox_new (FALSE, 5);
gtk_widget_show (hbox);
--- libexif-gtk/gtk-exif-entry-flash.c
+++ libexif-gtk/gtk-exif-entry-flash.c
@@ -113,8 +113,8 @@
entry->priv->entry = e;
exif_entry_ref (e);
gtk_exif_entry_construct (GTK_EXIF_ENTRY (entry),
- exif_tag_get_title (e->tag),
- exif_tag_get_description (e->tag));
+ exif_tag_get_title_in_ifd (e->tag, exif_content_get_ifd(e->parent)),
+ exif_tag_get_description_in_ifd (e->tag, exif_content_get_ifd(e->parent)));
check = gtk_check_button_new_with_label ("Flash fired");
gtk_widget_show (check);
--- libexif-gtk/gtk-exif-entry-generic.c
+++ libexif-gtk/gtk-exif-entry-generic.c
@@ -97,8 +97,8 @@
entry->priv->entry = e;
exif_entry_ref (e);
gtk_exif_entry_construct (GTK_EXIF_ENTRY (entry),
- exif_tag_get_title (e->tag),
- exif_tag_get_description (e->tag));
+ exif_tag_get_title_in_ifd (e->tag, exif_content_get_ifd(e->parent)),
+ exif_tag_get_description_in_ifd (e->tag, exif_content_get_ifd(e->parent)));
table = gtk_table_new (2, 4, FALSE);
gtk_widget_show (table);
--- libexif-gtk/gtk-exif-entry-number.c
+++ libexif-gtk/gtk-exif-entry-number.c
@@ -218,8 +218,8 @@
entry->priv->entry = e;
exif_entry_ref (e);
gtk_exif_entry_construct (GTK_EXIF_ENTRY (entry),
- exif_tag_get_title (e->tag),
- exif_tag_get_description (e->tag));
+ exif_tag_get_title_in_ifd (e->tag, exif_content_get_ifd(e->parent)),
+ exif_tag_get_description_in_ifd (e->tag, exif_content_get_ifd(e->parent)));
table = gtk_table_new (2, 1, FALSE);
gtk_widget_show (table);
--- libexif-gtk/gtk-exif-entry-option.c
+++ libexif-gtk/gtk-exif-entry-option.c
@@ -254,8 +254,8 @@
entry->priv->entry = e;
exif_entry_ref (e);
gtk_exif_entry_construct (GTK_EXIF_ENTRY (entry),
- exif_tag_get_title (e->tag),
- exif_tag_get_description (e->tag));
+ exif_tag_get_title_in_ifd (e->tag, exif_content_get_ifd(e->parent)),
+ exif_tag_get_description_in_ifd (e->tag, exif_content_get_ifd(e->parent)));
hbox = gtk_hbox_new (FALSE, 5);
gtk_widget_show (hbox);
--- libexif-gtk/gtk-exif-entry-rational.c
+++ libexif-gtk/gtk-exif-entry-rational.c
@@ -220,8 +220,8 @@
entry->priv->entry = e;
exif_entry_ref (e);
gtk_exif_entry_construct (GTK_EXIF_ENTRY (entry),
- exif_tag_get_title (e->tag),
- exif_tag_get_description (e->tag));
+ exif_tag_get_title_in_ifd (e->tag, exif_content_get_ifd(e->parent)),
+ exif_tag_get_description_in_ifd (e->tag, exif_content_get_ifd(e->parent)));
table = gtk_table_new (4, 1, FALSE);
gtk_widget_show (table);
--- libexif-gtk/gtk-exif-entry-user-comment.c
+++ libexif-gtk/gtk-exif-entry-user-comment.c
@@ -216,8 +216,8 @@
entry->priv->entry = e;
exif_entry_ref (e);
gtk_exif_entry_construct (GTK_EXIF_ENTRY (entry),
- exif_tag_get_title (e->tag),
- exif_tag_get_description (e->tag));
+ exif_tag_get_title_in_ifd (e->tag, exif_content_get_ifd(e->parent)),
+ exif_tag_get_description_in_ifd (e->tag, exif_content_get_ifd(e->parent)));
hbox = gtk_hbox_new (FALSE, 0);
gtk_widget_show (hbox);
--- libexif-gtk/gtk-exif-entry-version.c
+++ libexif-gtk/gtk-exif-entry-version.c
@@ -235,8 +235,8 @@
entry->priv->entry = e;
exif_entry_ref (e);
gtk_exif_entry_construct (GTK_EXIF_ENTRY (entry),
- exif_tag_get_title (e->tag),
- exif_tag_get_description (e->tag));
+ exif_tag_get_title_in_ifd (e->tag, exif_content_get_ifd(e->parent)),
+ exif_tag_get_description_in_ifd (e->tag, exif_content_get_ifd(e->parent)));
hbox = gtk_hbox_new (FALSE, 5);
gtk_widget_show (hbox);
--- libexif-gtk/gtk-exif-tag-menu.c
+++ libexif-gtk/gtk-exif-tag-menu.c
@@ -120,10 +121,13 @@
menu = g_object_new (GTK_EXIF_TYPE_TAG_MENU, NULL);
+ /* UGLY: libexif does not provide API for "all known tags". */
+ /* FIXME: List should offer only tags legal in current IFD */
+ /* FIXME: Code is duplicate of gtk-exif-content-list:on_button_press_event() */
t = i = 0;
memset (tags, 0, sizeof (GtkOptions) * LIST_SIZE);
while ((t < 0xffff) && (i < LIST_SIZE - 1)) {
- name = exif_tag_get_name (t);
+ name = exif_tag_get_name (t); /* FIXME: needs rewrite */
if (name) {
tags[i].option = t;
tags[i].name = name;
@@ -131,6 +135,15 @@
}
t++;
}
+ /* These two tags are only two known non-unique IFD spefic tags. */
+ name = exif_tag_get_name_in_ifd (EXIF_TAG_GPS_LATITUDE_REF, EXIF_IFD_GPS);
+ tags[t].option = EXIF_TAG_GPS_LATITUDE_REF;
+ tags[t].name = name;
+ t++;
+ name = exif_tag_get_name_in_ifd (EXIF_TAG_GPS_LATITUDE, EXIF_IFD_GPS);
+ tags[t].option = EXIF_TAG_GPS_LATITUDE;
+ tags[t].name = name;
+ t++;
gtk_menu_option_construct (GTK_MENU_OPTION (menu), tags);
g_signal_connect (GTK_OBJECT (menu), "option_selected",
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org