From 69f7a1780df8303c58fd56ac0a6d0a782f766a37 Mon Sep 17 00:00:00 2001
From: Mamoru Tasaka <mtasaka@fedoraproject.org>
Date: Sat, 9 Jun 2007 06:14:34 +0000
Subject: [PATCH] - Update to 1.2.4 - Support python chmlib libiptcdata

---
 .cvsignore                                    |  2 +-
 ...commander-1.2.3-xsltproc-OMF-element.patch | 28 ----------------
 gnome-commander.spec                          | 33 +++++++++++++++----
 sources                                       |  2 +-
 4 files changed, 28 insertions(+), 37 deletions(-)
 delete mode 100644 gnome-commander-1.2.3-xsltproc-OMF-element.patch

diff --git a/.cvsignore b/.cvsignore
index e639432..ecc6b97 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gnome-commander-1.2.3.tar.bz2
+gnome-commander-1.2.4.tar.bz2
diff --git a/gnome-commander-1.2.3-xsltproc-OMF-element.patch b/gnome-commander-1.2.3-xsltproc-OMF-element.patch
deleted file mode 100644
index 2858560..0000000
--- a/gnome-commander-1.2.3-xsltproc-OMF-element.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- gnome-commander-1.2.3/doc/C/gnome-commander.xml.orig	2006-12-11 16:12:37.000000000 -0500
-+++ gnome-commander-1.2.3/doc/C/gnome-commander.xml	2007-04-17 01:59:01.000000000 -0400
-@@ -27,6 +27,14 @@
-   <articleinfo>
-     <title>&app; Manual V&manrevision;</title>
- 
-+    <abstract role="description">
-+      <para> 
-+	GNOME Commander is a nice and fast file manager for the GNOME desktop.
-+	In addition to performing the basic filemanager functions the program is
-+	also an FTP-client and it can browse SMB-networks.
-+      </para>
-+    </abstract>
-+
-     <copyright>
-       <year>2000</year>
-       <year>2001</year>
-@@ -51,6 +59,10 @@
-       <publishername> GNOME Documentation Project</publishername>
-     </publisher>
- 
-+    <othercredit role="maintainer">
-+      <name>GNOME Documentation Project</name>
-+    </othercredit>
-+
-    &legal;
-    <!-- This file  contains link to license for the documentation (GNU FDL), and
-         other legal stuff such as "NO WARRANTY" statement. Please do not change
diff --git a/gnome-commander.spec b/gnome-commander.spec
index 2c1ea09..36d1d96 100644
--- a/gnome-commander.spec
+++ b/gnome-commander.spec
@@ -1,31 +1,39 @@
 %define        id3lib_ver            3.8.3
 %define        libexif_ver           0.6.12
+%define        libgsf_ver            1.12.0
+%define        libiptcdata_ver       0.2.1
+%define        python_ver            2.4
 
 Name:          gnome-commander
-Version:       1.2.3
-Release:       7%{?dist}
+Version:       1.2.4
+Release:       1%{?dist}
 Summary:       A nice and fast file manager for the GNOME desktop
 
 Group:         Applications/File
 License:       GPL
 URL:           http://www.nongnu.org/gcmd/
 Source0:       ftp://ftp.gnome.org/pub/GNOME/sources/%{name}/1.2/%{name}-%{version}.tar.bz2
-Patch0:        gnome-commander-1.2.3-xsltproc-OMF-element.patch
 BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: desktop-file-utils
-BuildRequires: scrollkeeper
 BuildRequires: gettext
+BuildRequires: scrollkeeper
 
+BuildRequires: chmlib-devel
 BuildRequires: id3lib-devel >= %{id3lib_ver}
 BuildRequires: lcms-devel
-BuildRequires: libgnomeui-devel
 BuildRequires: libexif-devel >= %{libexif_ver}
+BuildRequires: libgnomeui-devel
+BuildRequires: libiptcdata-devel >= %{libiptcdata_ver}
+
 BuildRequires: gnome-doc-utils
 BuildRequires: perl(XML::Parser)
+BuildRequires: python-devel >= %{python_ver}
 
+Requires:         gnome-python2-gnomevfs
 Requires:         id3lib >= %{id3lib_ver}
 Requires:         libexif >= %{libexif_ver}
+Requires:         libiptcdata >= %{libiptcdata_ver}
 Requires:         meld
 Requires:         yelp
 Requires(post):   scrollkeeper
@@ -38,10 +46,11 @@ also an FTP-client and it can browse SMB-networks.
 
 %prep
 %setup -q
-%patch0 -p1 -b .xsltproc
 
 %build
-%configure --disable-scrollkeeper
+%configure \
+   --disable-scrollkeeper \
+   --enable-python
 %{__make} %{?_smp_mflags}
 
 %install
@@ -89,6 +98,16 @@ scrollkeeper-update -q || :
 %{_datadir}/pixmaps/%{name}/
 
 %changelog
+* Sat Jun  9 2007 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 1.2.4-1
+- Update to 1.2.4
+- Support python chmlib libiptcdata
+
+- From upstream:
+  Sun Feb 4 2007 Piotr Eljasiak <epiotr@use.pl> 
+  - added libgsf dependencies
+  Wed Jan 30 2007 Piotr Eljasiak <epiotr@use.pl>
+  - added build and runtime deps for python and gnome-python2-gnomevfs
+
 * Sat Jun  9 2007 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 1.2.3-7
 - Require yelp (#243392)
 
diff --git a/sources b/sources
index 896e659..2688f23 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-817ee443d970c9efb5553b7b6103ab86  gnome-commander-1.2.3.tar.bz2
+9897237e3d297086d88ddf3c7d0dc560  gnome-commander-1.2.4.tar.bz2