* Fri Feb 24 2012 Ankur Sinha <ankursinha AT fedoraproject DOT org>
- Update to new release
This commit is contained in:
parent
732e047ba3
commit
887ed9f46d
1
.gitignore
vendored
1
.gitignore
vendored
@ -2,3 +2,4 @@ libgexiv2-0.1.0.tar.gz
|
||||
libgexiv2-0.1.90.tar.gz
|
||||
/libgexiv2-0.2.0.tar.bz2
|
||||
/libgexiv2-0.2.2.tar.bz2
|
||||
/libgexiv2-0.3.91.tar.bz2
|
||||
|
@ -1,35 +0,0 @@
|
||||
diff -ur libgexiv2-0.2.1-orig/gexiv2/gexiv2-metadata-exif.cpp libgexiv2-0.2.1/gexiv2/gexiv2-metadata-exif.cpp
|
||||
--- libgexiv2-0.2.1-orig/gexiv2/gexiv2-metadata-exif.cpp 2010-09-10 17:52:54.000000000 -0400
|
||||
+++ libgexiv2-0.2.1/gexiv2/gexiv2-metadata-exif.cpp 2010-12-19 19:44:49.883274002 -0500
|
||||
@@ -235,10 +235,13 @@
|
||||
const gchar* gexiv2_metadata_get_exif_tag_label (const gchar* tag) {
|
||||
g_return_val_if_fail(tag != NULL, NULL);
|
||||
|
||||
- Exiv2::ExifKey key(tag);
|
||||
-
|
||||
try {
|
||||
+ Exiv2::ExifKey key(tag);
|
||||
+#if EXIV2_TEST_VERSION(0, 21, 0)
|
||||
+ return g_intern_string(key.tagLabel().c_str());
|
||||
+#else
|
||||
return Exiv2::ExifTags::tagLabel (key.tag (), key.ifdId ());
|
||||
+#endif
|
||||
} catch (Exiv2::Error& e) {
|
||||
LOG_ERROR(e);
|
||||
}
|
||||
@@ -249,10 +252,13 @@
|
||||
const gchar* gexiv2_metadata_get_exif_tag_description (const gchar* tag) {
|
||||
g_return_val_if_fail(tag != NULL, NULL);
|
||||
|
||||
- Exiv2::ExifKey key(tag);
|
||||
-
|
||||
try {
|
||||
+ Exiv2::ExifKey key(tag);
|
||||
+#if EXIV2_TEST_VERSION(0, 21, 0)
|
||||
+ return g_intern_string(key.tagDesc().c_str());
|
||||
+#else
|
||||
return Exiv2::ExifTags::tagDesc (key.tag (), key.ifdId ());
|
||||
+#endif
|
||||
} catch (Exiv2::Error& e) {
|
||||
LOG_ERROR(e);
|
||||
}
|
@ -1,6 +1,6 @@
|
||||
Name: libgexiv2
|
||||
Version: 0.2.2
|
||||
Release: 4%{?dist}
|
||||
Version: 0.3.91
|
||||
Release: 1%{?dist}
|
||||
Summary: Gexiv2 is a GObject-based wrapper around the Exiv2 library
|
||||
|
||||
Group: System Environment/Libraries
|
||||
@ -11,10 +11,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
|
||||
|
||||
BuildRequires: exiv2-devel gobject-introspection-devel libtool
|
||||
|
||||
## upstream patches
|
||||
# see http://trac.yorba.org/ticket/2899
|
||||
Patch100: http://trac.yorba.org/raw-attachment/ticket/2899/gexiv2-0.2.1-exiv2-0.21.patch
|
||||
|
||||
%description
|
||||
libgexiv2 is a GObject-based wrapper around the Exiv2 library.
|
||||
It makes the basic features of Exiv2 available to GNOME applications.
|
||||
@ -34,16 +30,15 @@ developing applications that use %{name}.
|
||||
%prep
|
||||
%setup -q
|
||||
|
||||
%patch100 -p1 -b .exiv2_0_21
|
||||
|
||||
%build
|
||||
## configure fails with the error:
|
||||
## configure: Invalid argument --program-prefix=
|
||||
## http://trac.yorba.org:8000/ticket/2001
|
||||
CFLAGS="%{optflags}"; export CFLAGS
|
||||
CXXFLAGS="%{optflags}"; export CXXFLAGS
|
||||
FFLAGS="%{optflags} -I/usr/lib64/gfortran/modules"; export FFLAGS
|
||||
LDFLAGS="--Wl,-z,relro"; export LDFLAGS
|
||||
|
||||
echo '%{configure}' | sed '/--program-prefix=/d' >build.tmp
|
||||
echo 'make %{?_smp_mflags}' >>build.tmp
|
||||
sh build.tmp
|
||||
# it is not an autotool generated configure script
|
||||
./configure --release --prefix=/usr
|
||||
make %{?_smp_mflags}
|
||||
|
||||
%install
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
@ -74,6 +69,11 @@ rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
|
||||
%changelog
|
||||
* Thu Feb 23 2012 Ankur Sinha <ankursinha AT fedoraproject DOT org> - 0.3.91-1
|
||||
- Update to 0.3.91
|
||||
- rhbz #796278
|
||||
- remove patches
|
||||
|
||||
* Fri Jan 13 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.2.2-4
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user