From: Jakub Bogusz Date: Sun, 31 Mar 2013 08:08:41 +0000 (+0200) Subject: - updated to 0.4.0 X-Git-Tag: auto/th/libexif-gtk-0.4.0-1 X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=57ba3795f246b8fc72884f89b9cf14fd180926bc;p=packages%2Flibexif-gtk.git - updated to 0.4.0 - removed obsolete ac,allow-deprecated patches and pl.po file - added am patch (fixes build with automake 1.13) - build both GTK+ 2.x (keeping libexif-gtk-* names) and GTK+ 3.x (as libexif-gtk3-*) versions --- diff --git a/libexif-gtk-ac.patch b/libexif-gtk-ac.patch deleted file mode 100644 index 7e968aa..0000000 --- a/libexif-gtk-ac.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- libexif-gtk-0.3.5/configure.in~ 2007-09-06 16:18:30.000000000 +0200 -+++ libexif-gtk-0.3.5/configure.in 2007-09-06 16:23:16.000000000 +0200 -@@ -52,7 +52,7 @@ - dnl --------------------------------------------------------------------------- - CPPFLAGS_save="$CPPFLAGS" - CPPFLAGS=$LIBEXIF_GTK_CFLAGS --AC_CHECK_HEADER([exif-mem.h], [ -+AC_CHECK_HEADER([libexif/exif-mem.h], [ - exif_msg=">= 0.6.12" - AC_DEFINE(HAVE_EXIF_0_6_12,1,[whether we use a version of libexif greater than 0.6.12])],[ - exif_msg="< 0.6.12 (think about upgrading)"]) -@@ -73,7 +73,7 @@ - - Configuration (${PACKAGE}): - -- Source code location: $(srcdir) -+ Source code location: ${srcdir} - Version: ${VERSION} - Compiler: ${CC} - diff --git a/libexif-gtk-allow-deprecated.patch b/libexif-gtk-allow-deprecated.patch deleted file mode 100644 index e6762bc..0000000 --- a/libexif-gtk-allow-deprecated.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -urN libexif-gtk-0.3.5/gtk-extensions/Makefile.am libexif-gtk-0.3.5.new/gtk-extensions/Makefile.am ---- libexif-gtk-0.3.5/gtk-extensions/Makefile.am 2004-10-17 16:57:31.000000000 +0200 -+++ libexif-gtk-0.3.5.new/gtk-extensions/Makefile.am 2008-11-09 19:33:18.000000000 +0100 -@@ -1,7 +1,6 @@ - INCLUDES = \ - -I$(top_srcdir) \ - -I$(top_srcdir)/intl \ -- -DGTK_DISABLE_DEPRECATED \ - $(GTK_CFLAGS) - - noinst_LTLIBRARIES = libgtk-extensions.la -diff -urN libexif-gtk-0.3.5/libexif-gtk/Makefile.am libexif-gtk-0.3.5.new/libexif-gtk/Makefile.am ---- libexif-gtk-0.3.5/libexif-gtk/Makefile.am 2004-10-17 15:48:35.000000000 +0200 -+++ libexif-gtk-0.3.5.new/libexif-gtk/Makefile.am 2008-11-09 19:33:11.000000000 +0100 -@@ -3,8 +3,7 @@ - -I$(top_srcdir)/intl \ - -I$(top_srcdir)/gtk-extensions \ - $(LIBEXIF_GTK_CFLAGS) \ -- -DG_LOG_DOMAIN=\"libexif\" \ -- -DGTK_DISABLE_DEPRECATED -+ -DG_LOG_DOMAIN=\"libexif\" - - lib_LTLIBRARIES = libexif-gtk.la - diff --git a/libexif-gtk-am.patch b/libexif-gtk-am.patch new file mode 100644 index 0000000..02bdbf6 --- /dev/null +++ b/libexif-gtk-am.patch @@ -0,0 +1,10 @@ +--- libexif-gtk-0.4.0/configure.ac.orig 2013-03-31 08:17:18.200396009 +0200 ++++ libexif-gtk-0.4.0/configure.ac 2013-03-31 08:18:37.943727623 +0200 +@@ -25,7 +25,6 @@ + GP_CONFIG_MSG([Source code location],[${srcdir}]) + + AC_PROG_CC +-AM_PROG_CC_STDC + AM_PROG_CC_C_O + AC_HEADER_STDC + diff --git a/libexif-gtk-pl.po b/libexif-gtk-pl.po deleted file mode 100644 index 379746e..0000000 --- a/libexif-gtk-pl.po +++ /dev/null @@ -1,55 +0,0 @@ -# Polish translation for libexif-gtk. -# This file is distributed under the same license as the libexif-gtk package. -# Jakub Bogusz , 2005. -# -msgid "" -msgstr "" -"Project-Id-Version: libexif-gtk 0.3.5\n" -"POT-Creation-Date: 2004-10-17 16:44+0200\n" -"PO-Revision-Date: 2005-03-21 17:20+0100\n" -"Last-Translator: Jakub Bogusz \n" -"Language-Team: Polish \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=UTF-8\n" -"Content-Transfer-Encoding: 8bit\n" - -#: libexif-gtk/gtk-exif-browser.c:145 -msgid "Nothing selected." -msgstr "Nic nie wybrano" - -#: libexif-gtk/gtk-exif-browser.c:393 -msgid "No thumbnail available." -msgstr "Miniaturka niedostępna." - -#: libexif-gtk/gtk-exif-browser.c:401 -msgid "Could not parse thumbnail data." -msgstr "Nie można przetworzyć danych miniaturki." - -#: libexif-gtk/gtk-exif-browser.c:416 -#, c-format -msgid "Size: %i byte(s)." -msgstr "Rozmiar: %i bajt(ów)." - -#: libexif-gtk/gtk-exif-browser.c:485 -msgid "Load..." -msgstr "Wczytaj..." - -#: libexif-gtk/gtk-exif-browser.c:525 -msgid "Save As..." -msgstr "Zapisz jako..." - -#: libexif-gtk/gtk-exif-browser.c:575 -msgid "Thumbnail" -msgstr "Miniaturka" - -#: libexif-gtk/gtk-exif-browser.c:592 -msgid "Load" -msgstr "Wczytaj" - -#: libexif-gtk/gtk-exif-browser.c:597 -msgid "Save" -msgstr "Zapisz" - -#: libexif-gtk/gtk-exif-browser.c:602 -msgid "Delete" -msgstr "Usuń" diff --git a/libexif-gtk.spec b/libexif-gtk.spec index 6f0a7e9..e7178e7 100644 --- a/libexif-gtk.spec +++ b/libexif-gtk.spec @@ -1,28 +1,30 @@ # # Conditional build: -%bcond_without static_libs # don't build static library +%bcond_without static_libs # static library +%bcond_without gtk2 # GTK+ 2.x version +%bcond_without gtk3 # GTK+ 3.x version # Summary: GTK+ widgets for libexif Summary(pl.UTF-8): Widgety GTK+ do libexif Name: libexif-gtk -Version: 0.3.5 -Release: 9 +Version: 0.4.0 +Release: 1 License: GPL Group: X11/Libraries Source0: http://downloads.sourceforge.net/libexif/%{name}-%{version}.tar.bz2 -# Source0-md5: 0ecdba41f3e0f20a11b8555bd2dd2a07 -Source1: %{name}-pl.po -Patch0: %{name}-ac.patch -Patch1: %{name}-allow-deprecated.patch +# Source0-md5: 777fe42272a3ef49fb65a4b62109731c +Patch0: %{name}-am.patch URL: http://libexif.sourceforge.net/ -BuildRequires: autoconf >= 2.50 -BuildRequires: automake -BuildRequires: gettext-devel -BuildRequires: gtk+2-devel >= 1:2.0.0 +BuildRequires: autoconf >= 2.59 +BuildRequires: automake >= 1:1.9 +BuildRequires: gettext-devel >= 0.14.1 +%{?with_gtk2:BuildRequires: gtk+2-devel >= 2:2.4} +%{?with_gtk3:BuildRequires: gtk+3-devel >= 3.0} BuildRequires: libexif-devel >= 1:0.6.16 BuildRequires: libtool BuildRequires: pkgconfig -Requires: libexif >= 1:0.6.16 +Requires: %{name}-common = %{version}-%{release} +Requires: gtk+2 >= 2:2.4 BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -32,61 +34,144 @@ Library of GTK+ widgets for libexif. Biblioteka widgetów GTK+ do libexif. %package devel -Summary: Header files for libexif-gtk -Summary(pl.UTF-8): Pliki nagłówkowe do libexif-gtk +Summary: Development files for libexif-gtk (GTK+ 2.x version) +Summary(pl.UTF-8): Pliki programistyczne biblioteki libexif-gtk (wersja dla GTK+ 2.x) Group: X11/Development/Libraries Requires: %{name} = %{version}-%{release} -Requires: gtk+2-devel -Requires: libexif-devel >= 1:0.6.16 +Requires: %{name}-devel-common = %{version}-%{release} +Requires: gtk+2-devel >= 2:2.4 %description devel -Header files for libexif-gtk. +Development files for libexif-gtk (GTK+ 2.x version). %description devel -l pl.UTF-8 -Pliki nagłówkowe do libexif-gtk. +Pliki programistyczne biblioteki libexif-gtk (wersja dla GTK+ 2.x). %package static -Summary: Static libexif-gtk library -Summary(pl.UTF-8): Statyczna biblioteka libexif-gtk +Summary: Static libexif-gtk library (GTK+ 2.x version) +Summary(pl.UTF-8): Statyczna biblioteka libexif-gtk (wersja dla GTK+ 2.x) Group: X11/Development/Libraries Requires: %{name}-devel = %{version}-%{release} %description static -Static version of libexif-gtk library. +Static libexif-gtk library (GTK+ 2.x version). %description static -l pl.UTF-8 -Statyczna wersja biblioteki libexif-gtk. +Statyczna biblioteka libexif-gtk (wersja dla GTK+ 2.x). + +%package common +Summary: Common files for both libexif-gtk (GTK+ 2.x/3.x) versions +Summary(pl.UTF-8): Pliki wspólne dla obu wersji libexif-gtk (GTK+ 2.x/3.x) +Group: Libraries +Requires: libexif >= 1:0.6.16 + +%description common +Common files for both libexif-gtk (GTK+ 2.x/3.x) versions. + +%description common -l pl.UTF-8 +Pliki wspólne dla obu wersji libexif-gtk (GTK+ 2.x/3.x). + +%package devel-common +Summary: Header files common for both libexif-gtk (GTK+ 2.x/3.x) versions +Summary(pl.UTF-8): Pliki nagłówkowe wspólne dla obu wersji libexif-gtk (GTK+ 2.x/3.x) +Group: Development/Libraries +Requires: %{name}-common = %{version}-%{release} +Requires: libexif-devel >= 1:0.6.16 + +%description devel-common +Header files common for both libexif-gtk (GTK+ 2.x/3.x) versions. + +%description devel-common -l pl.UTF-8 +Pliki nagłówkowe wspólne dla obu wersji libexif-gtk (GTK+ 2.x/3.x). + +%package -n libexif-gtk3 +Summary: GTK+ 3.x widgets for libexif +Summary(pl.UTF-8): Widgety GTK+ 3.x do libexif +Group: X11/Libraries +Requires: %{name}-common = %{version}-%{release} +Requires: gtk+3 >= 3.0 + +%description -n libexif-gtk3 +GTK+ 3.x widgets for libexif. + +%description -n libexif-gtk3 -l pl.UTF-8 +Widgety GTK+ 3.x do libexif. + +%package -n libexif-gtk3-devel +Summary: Development files for libexif-gtk (GTK+ 3.x version) +Summary(pl.UTF-8): Pliki programistyczne biblioteki libexif-gtk (wersja dla GTK+ 3.x) +Group: X11/Development/Libraries +Requires: %{name}-devel-common = %{version}-%{release} +Requires: libexif-gtk3 = %{version}-%{release} +Requires: gtk+3-devel >= 3.0 + +%description -n libexif-gtk3-devel +Development files for libexif-gtk (GTK+ 3.x version). + +%description -n libexif-gtk3-devel -l pl.UTF-8 +Pliki programistyczne biblioteki libexif-gtk (wersja dla GTK+ 3.x). + +%package -n libexif-gtk3-static +Summary: Static libexif-gtk library (GTK+ 3.x version) +Summary(pl.UTF-8): Statyczna biblioteka libexif-gtk (wersja dla GTK+ 3.x) +Group: X11/Development/Libraries +Requires: %{name}-devel = %{version}-%{release} + +%description -n libexif-gtk3-static +Static libexif-gtk library (GTK+ 3.x version). + +%description -n libexif-gtk3-static -l pl.UTF-8 +Statyczna biblioteka libexif-gtk (wersja dla GTK+ 3.x). %prep %setup -q %patch0 -p1 -%patch1 -p1 - -cp %{SOURCE1} po/pl.po -%{__perl} -pi -e 's/es fr ru/es fr pl ru/' configure.in -rm -f po/stamp-po %build %{__gettextize} %{__libtoolize} -%{__aclocal} +%{__aclocal} -I auto-m4 -I m4m %{__autoconf} %{__autoheader} %{__automake} -%configure \ + +%if %{with gtk2} +install -d gtk2 +cd gtk2 +../%configure \ %{!?with_static_libs:--disable-static} +%{__make} +cd .. +%endif +%if %{with gtk3} +install -d gtk3 +cd gtk3 +../%configure \ + %{!?with_static_libs:--disable-static} \ + --with-gtk3 %{__make} +cd .. +%endif %install rm -rf $RPM_BUILD_ROOT -%{__make} install \ +%if %{with gtk2} +%{__make} -C gtk2 install \ DESTDIR=$RPM_BUILD_ROOT %{__rm} $RPM_BUILD_ROOT%{_libdir}/libexif-gtk.la +%endif -%find_lang %{name} +%if %{with gtk2} +%{__make} -C gtk3 install \ + DESTDIR=$RPM_BUILD_ROOT + +%{__rm} $RPM_BUILD_ROOT%{_libdir}/libexif-gtk3.la +%endif + +%find_lang %{name}-5 %clean rm -rf $RPM_BUILD_ROOT @@ -94,16 +179,18 @@ rm -rf $RPM_BUILD_ROOT %post -p /sbin/ldconfig %postun -p /sbin/ldconfig -%files -f %{name}.lang +%post -n libexif-gtk3 -p /sbin/ldconfig +%postun -n libexif-gtk3 -p /sbin/ldconfig + +%if %{with gtk2} +%files %defattr(644,root,root,755) -%doc ChangeLog %attr(755,root,root) %{_libdir}/libexif-gtk.so.*.*.* %attr(755,root,root) %ghost %{_libdir}/libexif-gtk.so.5 %files devel %defattr(644,root,root,755) %attr(755,root,root) %{_libdir}/libexif-gtk.so -%{_includedir}/libexif-gtk %{_pkgconfigdir}/libexif-gtk.pc %if %{with static_libs} @@ -111,3 +198,30 @@ rm -rf $RPM_BUILD_ROOT %defattr(644,root,root,755) %{_libdir}/libexif-gtk.a %endif +%endif + +%files common -f %{name}-5.lang +%defattr(644,root,root,755) +%doc ChangeLog NEWS README + +%files devel-common +%defattr(644,root,root,755) +%{_includedir}/libexif-gtk + +%if %{with gtk3} +%files -n libexif-gtk3 +%defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/libexif-gtk3.so.*.*.* +%attr(755,root,root) %ghost %{_libdir}/libexif-gtk3.so.5 + +%files -n libexif-gtk3-devel +%defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/libexif-gtk3.so +%{_pkgconfigdir}/libexif-gtk3.pc + +%if %{with static_libs} +%files -n libexif-gtk3-static +%defattr(644,root,root,755) +%{_libdir}/libexif-gtk3.a +%endif +%endif