- updated to 1.0

- updated format-security patch
- removed obsolete link patch

diff --git a/format-security.patch b/format-security.patch
index 1d2d4f36679d63fd42d814b8d58990a98ad4ff87..ec5702ce1fe4ddc41e9e9c22b90f1793e48778b0 100644 (file)
--- a/format-security.patch
+++ b/format-security.patch
@@ -20,16 +20,16 @@
                gtk_window_set_transient_for (GTK_WINDOW (d),
                                              GTK_WINDOW (port));
                gtk_widget_show (d);
---- gtkam-0.2.0/src/gtkam-save.c~      2010-07-10 11:51:36.000000000 +0200
-+++ gtkam-0.2.0/src/gtkam-save.c       2013-06-12 18:46:54.274846517 +0200
+--- gtkam-1.0/src/gtkam-save.c.orig    2015-08-08 11:01:10.000000000 +0200
++++ gtkam-1.0/src/gtkam-save.c 2020-09-12 08:06:07.648695751 +0200
 @@ -252,7 +252,7 @@
  static int
  save_file (GtkamSave *save, const char *filename, CameraFile *file, CameraFileType type, guint n)
  {
--      gchar *full_path, *full_filename, *dirname, *msg, *number_filename;
-+      gchar *full_path, *full_filename, *dirname, *number_filename;
+-      gchar *full_path, *full_filename, *msg, *number_filename;
++      gchar *full_path, *full_filename, *number_filename;
        const char *mime_type;
-       const gchar *fsel_filename, *fsel_path, *prefix, *suffix;
+       const gchar *fsel_path, *prefix, *suffix;
        GtkWidget *dialog;
 @@ -296,14 +296,12 @@
  

diff --git a/gtkam-link.patch b/gtkam-link.patch
deleted file mode 100644 (file)
index fab4a34..0000000
--- a/gtkam-link.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- gtkam-0.1.18/src/Makefile.am.orig  2009-10-10 11:10:26.000000000 +0200
-+++ gtkam-0.1.18/src/Makefile.am       2012-06-26 19:21:51.542052607 +0200
-@@ -51,7 +51,7 @@
-       $(LIBEXIF_LIBS) \
-       $(LIBEXIF_GTK_LIBS) \
-       $(LIBGPHOTO2_LIBS)      \
--      $(GTKAM_LIBS)   \
-+      $(GTK_LIBS)     \
-       $(BONOBO_LIBS)  \
-       $(GNOME_LIBS)   \
-       $(INTLLIBS)

diff --git a/gtkam.spec b/gtkam.spec
index a251f2bfc90a8f3f71be34522423fdb3b6cbeeeb..1351d638e0b8a57bb803f10bbbab16e56a5cd472 100644 (file)
--- a/gtkam.spec
+++ b/gtkam.spec
@@ -7,30 +7,28 @@
 Summary:       GTKam - graphical frontend for gphoto2
 Summary(pl.UTF-8):     GTKam - graficzny interfejs do gphoto2
 Name:          gtkam
-Version:       0.2.0
-Release:       2
+Version:       1.0
+Release:       1
 License:       LGPL v2+
 Group:         X11/Applications/Graphics
 Source0:       http://downloads.sourceforge.net/gphoto/%{name}-%{version}.tar.bz2
-# Source0-md5: a94e8615efb2c975695401af6e13ef63
+# Source0-md5: a90cf29c7ae8fede38efb6edc3e83ed1
 Patch0:                %{name}-paths.patch
-Patch1:                %{name}-link.patch
-Patch2:                am.patch
-Patch3:                format-security.patch
+Patch1:                am.patch
+Patch2:                format-security.patch
 URL:           http://www.gphoto.org/proj/gtkam/
 BuildRequires: autoconf >= 2.59
 BuildRequires: automake >= 1:1.9
 BuildRequires: gettext-tools >= 0.14.1
 %{?with_gimp:BuildRequires:    gimp-devel >= 1:2.0}
-BuildRequires: gnome-common
 BuildRequires: gtk+2-devel >= 2.0.0
 BuildRequires: intltool
-%{?with_bonobo:BuildRequires:  libbonoboui-devel}
+%{?with_bonobo:BuildRequires:  libbonoboui-devel >= 2.0}
 BuildRequires: libexif-devel >= 0.3.2
 BuildRequires: libexif-gtk-devel
-%{?with_gnome:BuildRequires:   libgnomeui-devel}
+%{?with_gnome:BuildRequires:   libgnomeui-devel >= 2.0}
 BuildRequires: libgphoto2-devel >= 2.5.0
-BuildRequires: libtool
+BuildRequires: libtool >= 2:2
 %{?with_gimp:BuildRequires:    libusb-compat-devel}
 BuildRequires: pkgconfig
 BuildRequires: rpmbuild(find_lang) >= 1.23
@@ -67,14 +65,12 @@ gphoto2.
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
-%patch3 -p1
 
 %build
 %{__gettextize}
 %{__intltoolize}
-%{__gnome_doc_common}
 %{__libtoolize}
-%{__aclocal} -I m4m
+%{__aclocal} -I m4 -I gphoto-m4
 %{__autoconf}
 %{__automake}
 %configure \