rpms/kipi-plugins/devel kipi-plugins-0.1.3-exiv2.patch, NONE, 1.1 .cvsignore, 1.9, 1.10 kipi-plugins.spec, 1.26, 1.27

Rex Dieter (rdieter) fedora-extras-commits at redhat.com
Wed Apr 25 12:44:12 UTC 2007 

Author: rdieter

Update of /cvs/extras/rpms/kipi-plugins/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24658

Modified Files:
	.cvsignore kipi-plugins.spec 
Added Files:
	kipi-plugins-0.1.3-exiv2.patch 
Log Message:
* Mon Apr 25 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.1.3-3
- respin against exiv2-0.14


kipi-plugins-0.1.3-exiv2.patch:

--- NEW FILE kipi-plugins-0.1.3-exiv2.patch ---
Index: kipi-plugins/rawconverter/dcrawiface.cpp
===================================================================
--- kipi-plugins/rawconverter/dcrawiface.cpp	(revisione 627500)
+++ kipi-plugins/rawconverter/dcrawiface.cpp	(revisione 627501)
@@ -4,7 +4,7 @@
  * Date   : 2006-12-09
  * Description : dcraw interface (tested with dcraw 8.x releases)
  *
- * Copyright 2006 by Gilles Caulier and Marcel Wiesweg
+ * Copyright 2006-2007 by Gilles Caulier and Marcel Wiesweg
  *
  * This program is free software; you can redistribute it
  * and/or modify it under the terms of the GNU General
@@ -58,11 +58,14 @@
 #include <kprocess.h>
 #include <kstandarddirs.h>
 
+// LibKExiv2 includes. 
+
+#include <libkexiv2/libkexiv2.h>
+
 // Local includes.
 
 #include "pluginsversion.h"
 #include "rawfiles.h"
-#include "exiv2iface.h"
 #include "dcrawbinary.h"
 #include "dcrawiface.h"
 #include "dcrawiface.moc"
@@ -492,7 +495,7 @@
             fclose(f);
 
             // Metadata restoration and update.
-            KIPIPlugins::Exiv2Iface exiv2Iface;
+            KExiv2Library::LibKExiv2 exiv2Iface;
             exiv2Iface.load(filePath);
             exiv2Iface.setImageProgramId(QString("Kipi Raw Converter"), QString(kipiplugins_version));
             exiv2Iface.setImageDimensions(QSize(d->width, d->height));
@@ -547,7 +550,7 @@
             png_set_text(png_ptr, info_ptr, &(text), 1);
 
             // Metadata restoration and update.
-            KIPIPlugins::Exiv2Iface exiv2Iface;
+            KExiv2Library::LibKExiv2 exiv2Iface;
             exiv2Iface.load(filePath);
             exiv2Iface.setImageProgramId(QString("Kipi Raw Converter"), QString(kipiplugins_version));
             exiv2Iface.setImageDimensions(QSize(d->width, d->height));
@@ -624,7 +627,7 @@
 
 
             // Metadata restoration and update.
-            KIPIPlugins::Exiv2Iface exiv2Iface;
+            KExiv2Library::LibKExiv2 exiv2Iface;
             exiv2Iface.load(filePath);
             exiv2Iface.setImageProgramId(QString("Kipi Raw Converter"), QString(kipiplugins_version));
             exiv2Iface.setImageDimensions(QSize(d->width, d->height));
Index: kipi-plugins/rawconverter/Makefile.am
===================================================================
--- kipi-plugins/rawconverter/Makefile.am	(revisione 627500)
+++ kipi-plugins/rawconverter/Makefile.am	(revisione 627501)
@@ -5,23 +5,21 @@
 METASOURCES = AUTO
 SUBDIRS = profiles
 
-INCLUDES = $(KIPI_PLUGINS_COMMON_INCLUDE) $(LIBKIPI_CFLAGS) $(all_includes)
+INCLUDES = $(KIPI_PLUGINS_COMMON_INCLUDE) $(LIBKIPI_CFLAGS) $(LIBKEXIV2_CFLAGS) $(all_includes)
 
 # Install this plugin in the KDE modules directory
 kde_module_LTLIBRARIES = kipiplugin_rawconverter.la
 
-kipiplugin_rawconverter_la_DEPENDENCIES = $(LIBKIPI_LIBS_DEP) \
-	$(top_builddir)/kipi-plugins/common/exiv2iface/libexiv2iface.la 
+kipiplugin_rawconverter_la_DEPENDENCIES = $(LIBKIPI_LIBS_DEP) $(LIBKEXIV2_LIBS_DEP) 
 
 # Srcs for the plugin
 kipiplugin_rawconverter_la_SOURCES = plugin_rawconverter.cpp dcrawiface.cpp savesettingswidget.cpp \
-	                                 batchdialog.cpp actionthread.cpp dcrawsettingswidget.cpp \
-	                                 singledialog.cpp previewwidget.cpp iccjpeg.c dcrawbinary.cpp 
+	                             batchdialog.cpp actionthread.cpp dcrawsettingswidget.cpp \
+	                             singledialog.cpp previewwidget.cpp iccjpeg.c dcrawbinary.cpp 
 
 # Libs needed by the plugin
-kipiplugin_rawconverter_la_LIBADD = -ljpeg -lpng \
-				     $(top_builddir)/kipi-plugins/common/exiv2iface/libexiv2iface.la \
-				     $(LIB_TIFF) $(LIBKIPI_LIBS) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT)
+kipiplugin_rawconverter_la_LIBADD = -ljpeg -lpng $(LIBKEXIV2_LIBS) \
+	                            $(LIB_TIFF) $(LIBKIPI_LIBS) $(LIB_KIO) $(LIB_KDEUI) $(LIB_KDECORE) $(LIB_QT)
 
 # LD flags for the plugin
 kipiplugin_rawconverter_la_LDFLAGS = $(KIPI_PLUGINS_COMMON_LDFLAGS) -module $(KDE_PLUGIN) $(all_libraries) -lkipiplugins
Index: kipi-plugins/rawconverter/dcrawiface.h
===================================================================
--- kipi-plugins/rawconverter/dcrawiface.h	(revisione 627500)
+++ kipi-plugins/rawconverter/dcrawiface.h	(revisione 627501)
@@ -4,7 +4,7 @@
  * Date   : 2006-12-09
  * Description : dcraw interface (tested with dcraw 8.x releases)
  *
- * Copyright 2006 by Gilles Caulier and Marcel Wiesweg
+ * Copyright 2006-2007 by Gilles Caulier and Marcel Wiesweg
  *
  * This program is free software; you can redistribute it
  * and/or modify it under the terms of the GNU General
Index: kipi-plugins/metadataedit/iptcstatus.cpp
===================================================================
--- kipi-plugins/metadataedit/iptcstatus.cpp	(revisione 627500)
+++ kipi-plugins/metadataedit/iptcstatus.cpp	(revisione 627501)
@@ -3,7 +3,7 @@
  * Date   : 2006-10-12
  * Description : IPTC status settings page.
  * 
- * Copyright 2006 by Gilles Caulier
+ * Copyright 2006-2007 by Gilles Caulier
  *
  * This program is free software; you can redistribute it
  * and/or modify it under the terms of the GNU General
@@ -34,11 +34,14 @@
 #include <kapplication.h>
 #include <kaboutdata.h>
 
+// LibKExiv2 includes. 
+
+#include <libkexiv2/libkexiv2.h>
+
 // Local includes.
 
 #include "metadatacheckbox.h"
 #include "pluginsversion.h"
-#include "exiv2iface.h"
 #include "iptcstatus.h"
 #include "iptcstatus.moc"
 
@@ -291,7 +294,7 @@
 void IPTCStatus::readMetadata(QByteArray& iptcData)
 {
     blockSignals(true);
-    KIPIPlugins::Exiv2Iface exiv2Iface;
+    KExiv2Library::LibKExiv2 exiv2Iface;
     exiv2Iface.setIptc(iptcData);
     QString data;
     int     val;
@@ -408,7 +411,7 @@
 
 void IPTCStatus::applyMetadata(QByteArray& iptcData)
 {
-    KIPIPlugins::Exiv2Iface exiv2Iface;
+    KExiv2Library::LibKExiv2 exiv2Iface;
     exiv2Iface.setIptc(iptcData);
 
     if (d->statusCheck->isChecked())
Index: kipi-plugins/metadataedit/plugin_metadataedit.cpp
===================================================================
--- kipi-plugins/metadataedit/plugin_metadataedit.cpp	(revisione 627500)
+++ kipi-plugins/metadataedit/plugin_metadataedit.cpp	(revisione 627501)
@@ -3,7 +3,7 @@
  * Date   : 2006-10-11
  * Description : a plugin to edit pictures metadata
  *
- * Copyright 2006 by Gilles Caulier
+ * Copyright 2006-2007 by Gilles Caulier
  *
  * This program is free software; you can redistribute it
  * and/or modify it under the terms of the GNU General
@@ -36,9 +36,12 @@
 
 #include <libkipi/imagecollection.h>
 
+// LibKExiv2 includes. 
+
+#include <libkexiv2/libkexiv2.h>
+
 // Local includes.
 
-#include "exiv2iface.h"
 #include "exifeditdialog.h"
 #include "iptceditdialog.h"
 #include "commenteditdialog.h"
@@ -186,10 +189,10 @@
         KURL url = *it;
         bool ret = false;
 
-        if (!KIPIPlugins::Exiv2Iface::isReadOnly(url.path()))
+        if (!KExiv2Library::LibKExiv2::isReadOnly(url.path()))
         {
             ret = true;
-            KIPIPlugins::Exiv2Iface exiv2Iface;
+            KExiv2Library::LibKExiv2 exiv2Iface;
             ret &= exiv2Iface.load(url.path());
             ret &= exiv2Iface.clearExif();
             ret &= exiv2Iface.save(url.path());
@@ -229,7 +232,7 @@
     if( importEXIFFile.isEmpty() )
        return;
     
-    KIPIPlugins::Exiv2Iface exiv2Iface;
+    KExiv2Library::LibKExiv2 exiv2Iface;
     if (!exiv2Iface.load(importEXIFFile.path()))
     {
         KMessageBox::error(kapp->activeWindow(), 
[...2379 lines suppressed...]
-#include <libkexiv2/libkexiv2.h>
+#include <libkexiv2/kexiv2.h>
 
 // Local includes.
 
Index: kipi-plugins/metadataedit/iptckeywords.cpp
===================================================================
--- kipi-plugins/metadataedit/iptckeywords.cpp	(revisione 628539)
+++ kipi-plugins/metadataedit/iptckeywords.cpp	(revisione 628540)
@@ -36,7 +36,7 @@
 
 // LibKExiv2 includes. 
 
-#include <libkexiv2/libkexiv2.h>
+#include <libkexiv2/kexiv2.h>
 
 // Local includes.
 
Index: kipi-plugins/metadataedit/iptcsubjects.cpp
===================================================================
--- kipi-plugins/metadataedit/iptcsubjects.cpp	(revisione 628539)
+++ kipi-plugins/metadataedit/iptcsubjects.cpp	(revisione 628540)
@@ -36,7 +36,7 @@
 
 // LibKExiv2 includes. 
 
-#include <libkexiv2/libkexiv2.h>
+#include <libkexiv2/kexiv2.h>
 
 // Local includes.
 
Index: kipi-plugins/metadataedit/exifadjust.cpp
===================================================================
--- kipi-plugins/metadataedit/exifadjust.cpp	(revisione 628539)
+++ kipi-plugins/metadataedit/exifadjust.cpp	(revisione 628540)
@@ -37,7 +37,7 @@
 
 // LibKExiv2 includes. 
 
-#include <libkexiv2/libkexiv2.h>
+#include <libkexiv2/kexiv2.h>
 
 // Local includes.
 
Index: kipi-plugins/metadataedit/iptcorigin.cpp
===================================================================
--- kipi-plugins/metadataedit/iptcorigin.cpp	(revisione 628539)
+++ kipi-plugins/metadataedit/iptcorigin.cpp	(revisione 628540)
@@ -36,7 +36,7 @@
 
 // LibKExiv2 includes. 
 
-#include <libkexiv2/libkexiv2.h>
+#include <libkexiv2/kexiv2.h>
 
 // Local includes.
 
Index: kipi-plugins/metadataedit/exifdevice.cpp
===================================================================
--- kipi-plugins/metadataedit/exifdevice.cpp	(revisione 628539)
+++ kipi-plugins/metadataedit/exifdevice.cpp	(revisione 628540)
@@ -40,7 +40,7 @@
 
 // LibKExiv2 includes. 
 
-#include <libkexiv2/libkexiv2.h>
+#include <libkexiv2/kexiv2.h>
 
 // Local includes.
 
Index: kipi-plugins/metadataedit/iptcdatetime.cpp
===================================================================
--- kipi-plugins/metadataedit/iptcdatetime.cpp	(revisione 628539)
+++ kipi-plugins/metadataedit/iptcdatetime.cpp	(revisione 628540)
@@ -39,7 +39,7 @@
 
 // LibKExiv2 includes. 
 
-#include <libkexiv2/libkexiv2.h>
+#include <libkexiv2/kexiv2.h>
 
 // Local includes.
 
Index: kipi-plugins/metadataedit/iptccredits.cpp
===================================================================
--- kipi-plugins/metadataedit/iptccredits.cpp	(revisione 628539)
+++ kipi-plugins/metadataedit/iptccredits.cpp	(revisione 628540)
@@ -36,7 +36,7 @@
 
 // LibKExiv2 includes. 
 
-#include <libkexiv2/libkexiv2.h>
+#include <libkexiv2/kexiv2.h>
 
 // Local includes.
 
Index: kipi-plugins/metadataedit/iptccaption.cpp
===================================================================
--- kipi-plugins/metadataedit/iptccaption.cpp	(revisione 628539)
+++ kipi-plugins/metadataedit/iptccaption.cpp	(revisione 628540)
@@ -40,7 +40,7 @@
 
 // LibKExiv2 includes. 
 
-#include <libkexiv2/libkexiv2.h>
+#include <libkexiv2/kexiv2.h>
 
 // Local includes.
 
Index: kipi-plugins/metadataedit/exifeditdialog.cpp
===================================================================
--- kipi-plugins/metadataedit/exifeditdialog.cpp	(revisione 628539)
+++ kipi-plugins/metadataedit/exifeditdialog.cpp	(revisione 628540)
@@ -43,7 +43,7 @@
 
 // LibKExiv2 includes. 
 
-#include <libkexiv2/libkexiv2.h>
+#include <libkexiv2/kexiv2.h>
 
 // Local includes.
 
Index: kipi-plugins/galleryexport/gallerytalker.cpp
===================================================================
--- kipi-plugins/galleryexport/gallerytalker.cpp	(revisione 628539)
+++ kipi-plugins/galleryexport/gallerytalker.cpp	(revisione 628540)
@@ -36,7 +36,7 @@
 
 // LibKExiv2 includes. 
 
-#include <libkexiv2/libkexiv2.h>
+#include <libkexiv2/kexiv2.h>
 
 #include "galleryitem.h"
 #include "gallerympform.h"
Index: kipi-plugins/timeadjust/timeadjustdialog.cpp
===================================================================
--- kipi-plugins/timeadjust/timeadjustdialog.cpp	(revisione 628539)
+++ kipi-plugins/timeadjust/timeadjustdialog.cpp	(revisione 628540)
@@ -56,7 +56,7 @@
 
 // LibKExiv2 includes. 
 
-#include <libkexiv2/libkexiv2.h>
+#include <libkexiv2/kexiv2.h>
 
 // Local includes.
 
Index: kipi-plugins/sendimages/sendimages.cpp
===================================================================
--- kipi-plugins/sendimages/sendimages.cpp	(revisione 628539)
+++ kipi-plugins/sendimages/sendimages.cpp	(revisione 628540)
@@ -53,7 +53,7 @@
 
 // LibKExiv2 includes. 
 
-#include <libkexiv2/libkexiv2.h>
+#include <libkexiv2/kexiv2.h>
 
 // Local include files
 
Index: kipi-plugins/gpssync/gpslistviewitem.cpp
===================================================================
--- kipi-plugins/gpssync/gpslistviewitem.cpp	(revisione 628539)
+++ kipi-plugins/gpssync/gpslistviewitem.cpp	(revisione 628540)
@@ -31,7 +31,7 @@
 
 // LibKExiv2 includes. 
 
-#include <libkexiv2/libkexiv2.h>
+#include <libkexiv2/kexiv2.h>
 
 // Local includes.
 
Index: kipi-plugins/gpssync/plugin_gpssync.cpp
===================================================================
--- kipi-plugins/gpssync/plugin_gpssync.cpp	(revisione 628539)
+++ kipi-plugins/gpssync/plugin_gpssync.cpp	(revisione 628540)
@@ -40,7 +40,7 @@
 
 // LibKExiv2 includes. 
 
-#include <libkexiv2/libkexiv2.h>
+#include <libkexiv2/kexiv2.h>
 
 // Local includes.
 
Index: kipi-plugins/jpeglossless/jpegtransform.h
===================================================================
--- kipi-plugins/jpeglossless/jpegtransform.h	(revisione 628539)
+++ kipi-plugins/jpeglossless/jpegtransform.h	(revisione 628540)
@@ -30,7 +30,7 @@
 
 // LibKExiv2 includes. 
 
-#include <libkexiv2/libkexiv2.h>
+#include <libkexiv2/kexiv2.h>
 
 namespace KIPIJPEGLossLessPlugin
 {


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/kipi-plugins/devel/.cvsignore,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- .cvsignore	24 Jan 2007 22:52:45 -0000	1.9
+++ .cvsignore	25 Apr 2007 12:43:38 -0000	1.10
@@ -1,3 +1,3 @@
+clog
 kipi-plugins-0.1.2.tar.bz2
-kipi-plugins-0.1.3-rc1.tar.bz2
 kipi-plugins-0.1.3.tar.bz2


Index: kipi-plugins.spec
===================================================================
RCS file: /cvs/extras/rpms/kipi-plugins/devel/kipi-plugins.spec,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -r1.26 -r1.27
--- kipi-plugins.spec	24 Jan 2007 23:06:54 -0000	1.26
+++ kipi-plugins.spec	25 Apr 2007 12:43:38 -0000	1.27
@@ -1,8 +1,10 @@
 
+# Fedora review: http://bugzilla.redhat.com/171504
+
 Name:    kipi-plugins
 Summary: Plugins to use with Kipi
 Version: 0.1.3
-Release: 2%{?dist}
+Release: 3%{?dist}
 
 License: LGPL
 Group:   Applications/Multimedia
@@ -10,10 +12,14 @@
 Source0: http://dl.sourceforge.net/sourceforge/kipi/kipi-plugins-%{version}%{?beta:-%{beta}}.tar.bz2
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
+Patch1:  kipi-plugins-0.1.3-exiv2.patch
+BuildRequires: automake libtool
+
 BuildRequires: gettext
 BuildRequires: libkipi-devel >= 0.1.5
 BuildRequires: kdelibs-devel 
-BuildRequires: exiv2-devel
+BuildRequires: libkexiv2-devel
+BuildRequires: exiv2-devel >= 0.14
 %if 0%{?fedora} > 6
 ## ipod support currently busted, omit, for now. -- Rex
 #define _with_libgpod --with-libgpod
@@ -92,6 +98,9 @@
 %prep
 %setup -q -n %{name}-%{version}%{?beta:-%{beta}}
 
+%patch1 -p0 -b .exiv2
+make -f admin/Makefile.common
+
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -166,6 +175,9 @@
 
 
 %changelog
+* Mon Apr 25 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.1.3-3
+- respin against exiv2-0.14
+
 * Wed Jan 24 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 0.1.3-2
 - drop --with-libgpod, still busted

More information about the scm-commits mailing list