- updated to 1.2.5

Changed files:
    gnome-commander-as-needed.patch -> 1.3
    gnome-commander.spec -> 1.43

diff --git a/gnome-commander-as-needed.patch b/gnome-commander-as-needed.patch
index 55d4c97130d121083940834c3fc89424d5c4164d..4097591c8a0e127e45863966791e5dca75ded7e9 100644 (file)
--- a/gnome-commander-as-needed.patch
+++ b/gnome-commander-as-needed.patch
@@ -5,40 +5,27 @@
        $(GNOMEVFS_CFLAGS) \
        $(PYTHON_CFLAGS) \
 +      $(IPTCDATA_CFLAGS) \
+       -DDATADIR=\""$(datadir)"\"\
        -DPLUGIN_DIR=\""$(libdir)/$(PACKAGE)/plugins"\"
  
- bin_PROGRAMS = gnome-commander gcmd-block
-@@ -88,6 +89,10 @@
+@@ -92,6 +93,9 @@
  endif
  
  gnome_commander_LDADD = \
 +      $(top_builddir)/libgcmd/libgcmd.la \
 +      tags/libgcmd-tags.a \
-+      tags/id3lib/libgcmd-id3lib.a \
-+      libgviewer/libgviewer.a \
-       $(GNOMEUI_LIBS) \
-       $(GNOMEVFS_LIBS) \
-       $(EXIF_LIBS) \
-@@ -97,10 +102,7 @@
++      intviewer/libgviewer.a \
+       $(GNOMEUI_LIBS) \
+       $(GNOMEVFS_LIBS) \
+       $(EXIV2_LIBS) \
+@@ -101,10 +105,8 @@
        $(GSF_LIBS) \
        $(PYTHON_LIBS) \
        $(PYTHON_EXTRA_LIBS) \
 -      $(top_builddir)/libgcmd/libgcmd.la \
 -      tags/libgcmd-tags.a \
--      tags/id3lib/libgcmd-id3lib.a \
--      libgviewer/libgviewer.a
+-      intviewer/libgviewer.a
 +      $(IPTCDATA_LIBS)
  
  gnome_commander_LDFLAGS = \
        $(GNOMEUI_LIBS) \
---- gnome-commander-1.2.4/tests/gviewer/Makefile.am~   2007-03-12 00:54:44.000000000 +0100
-+++ gnome-commander-1.2.4/tests/gviewer/Makefile.am    2007-09-04 16:19:39.000000000 +0200
-@@ -7,7 +7,7 @@
- 
- noinst_PROGRAMS = fileops inputmodes datapresentation textrenderer imagerenderer dualrenderer viewerwidget viewerwindow bm_byte_test bm_chartype_test utils_test search_dlg_test
- 
--TESTLIBS = $(GLIB_LIBS) $(GTK_LIBS) $(GNOMEUI_LIBS) $(top_builddir)/src/libgviewer/libgviewer.a
-+TESTLIBS = $(top_builddir)/src/libgviewer/libgviewer.a $(GLIB_LIBS) $(GTK_LIBS) $(GNOMEUI_LIBS)
- 
- fileops_SOURCES = fileops.c
- fileops_LDADD = $(TESTLIBS)

diff --git a/gnome-commander.spec b/gnome-commander.spec
index b1f57fa1d71e456a02658c85dbc1cc4da2603aa0..6ca9fc8e4afe9d5938995c4f97c0c9c7a0de017a 100644 (file)
--- a/gnome-commander.spec
+++ b/gnome-commander.spec
@@ -1,14 +1,15 @@
 Summary:       A GNOME filemanager similar to the Midnight Commander
 Summary(pl.UTF-8):     Zarządca plików dla środowiska GNOME w stylu Midnight Commandera
 Name:          gnome-commander
-Version:       1.2.4
-Release:       2
+Version:       1.2.5
+Release:       1
 License:       GPL v2
 Group:         X11/Applications
 Source0:       http://ftp.gnome.org/pub/GNOME/sources/gnome-commander/1.2/%{name}-%{version}.tar.bz2
-# Source0-md5: 9897237e3d297086d88ddf3c7d0dc560
+# Source0-md5: 7f6067eb837d3369f98bef80a6877596
 Patch0:                %{name}-desktop.patch
 Patch1:                %{name}-as-needed.patch
+Patch2:                %{name}-configure.in.patch
 URL:           http://www.nongnu.org/gcmd/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -40,6 +41,7 @@ kilka dodatkowych jak np. klienta FTP.
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__glib_gettextize}