rpms/pyexiv2/F-9 pyexiv2-multilib.patch, NONE, 1.1 pyexiv2-packager.patch, NONE, 1.1 pyexiv2.spec, NONE, 1.1

[Matej Cepl (mcepl)]

Author: mcepl

Update of /cvs/extras/rpms/pyexiv2/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3038

Added Files:
	pyexiv2-multilib.patch pyexiv2-packager.patch pyexiv2.spec 
Log Message:
Initial commit

pyexiv2-multilib.patch:

--- NEW FILE pyexiv2-multilib.patch ---
diff -Nru pyexiv2.orig/src/SConscript pyexiv2/src/SConscript
--- pyexiv2.orig/src/SConscript	2008-02-18 23:32:00.000000000 +0100
+++ pyexiv2/src/SConscript	2008-07-17 17:45:25.000000000 +0200
@@ -3,6 +3,7 @@
 
 import sys
 import os.path
+from distutils.sysconfig import get_python_lib
 
 env = Environment()
 
@@ -22,7 +23,8 @@
 #Â 'scons install'. If DESTDIR is specified on the command line when invoking
 # scons, it will be prepended to each installed target file. See
 # http://www.gnu.org/prep/standards/html_node/DESTDIR.html for reference.
-python_lib_path = os.path.join(sys.prefix, 'lib', 'python' + sys.version[:3], 'site-packages')
+#python_lib_path = os.path.join(sys.prefix, 'lib', 'python' + sys.version[:3], 'site-packages')
+python_lib_path = get_python_lib(1)
 dest_dir = ARGUMENTS.get('DESTDIR')
 if (dest_dir is None) or (not os.path.isabs(dest_dir)):
     install_dir = python_lib_path

pyexiv2-packager.patch:

--- NEW FILE pyexiv2-packager.patch ---
diff -Nru pyexiv2.multilib/src/SConscript pyexiv2/src/SConscript
--- pyexiv2.multilib/src/SConscript	2008-07-17 21:39:05.000000000 +0200
+++ pyexiv2/src/SConscript	2008-07-17 21:43:07.000000000 +0200
@@ -5,8 +5,22 @@
 import os.path
 from distutils.sysconfig import get_python_lib
 
+import os
+import SCons.Util
+
 env = Environment()
 
+if os.environ.has_key('CC'):
+        env['CC'] = os.environ['CC']
+if os.environ.has_key('CFLAGS'):
+        env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CFLAGS'])
+if os.environ.has_key('CXX'):
+        env['CXX'] = os.environ['CXX']
+if os.environ.has_key('CXXFLAGS'):
+        env['CXXFLAGS'] += SCons.Util.CLVar(os.environ['CXXFLAGS'])
+if os.environ.has_key('LDFLAGS'):
+        env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS'])
+
 # Include directories to look for 'Python.h' in
 python_inc_path = os.path.join(sys.prefix, 'include', 'python' + sys.version[:3])
 env.Append(CPPPATH=[python_inc_path])


--- NEW FILE pyexiv2.spec ---
# sitelib for noarch packages, sitearch for others (remove the unneeded one)
%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}

Name:           pyexiv2
Version:        0.1.2
Release:        3%{?dist}
Summary:        Python binding to exiv2

Group:          Development/Languages
License:        GPLv2+
URL:            http://tilloy.net/dev/pyexiv2/
Source0:        http://tilloy.net/dev/pyexiv2/releases/pyexiv2-%{version}.tar.bz2
# next patch should be removed when
# https://bugs.launchpad.net/pyexiv2/+bug/249513
# is fixed
Patch0:         pyexiv2-multilib.patch
# the same for bug
# https://bugs.launchpad.net/pyexiv2/+bug/249835
Patch1:         pyexiv2-packager.patch
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
      
BuildRequires:  python-devel exiv2-devel boost-devel scons

%description
pyexiv2 is a python binding to exiv2, the C++ library for manipulation
of EXIF and IPTC image metadata. It is a python module that allows your
python scripts to read and write metadata (EXIF, IPTC, thumbnail)
embedded in image files (JPEG, TIFF, ...). 

%prep
%setup -q -n %{name}
%patch0 -p1 -b .multilib
%patch1 -p1 -b .packager

%build
# Remove CFLAGS=... for noarch packages (unneeded)
#CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
export CXXFLAGS="%{optflags}"
export LDFLAGS="%{optflags}"
scons

%install
rm -rf $RPM_BUILD_ROOT
#%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
export CXXFLAGS="%{optflags}"
export LDFLAGS="%{optflags}"
scons DESTDIR=$RPM_BUILD_ROOT install
chmod +x ${RPM_BUILD_ROOT}%{python_sitearch}/pyexiv2.py

%clean
rm -rf $RPM_BUILD_ROOT

%check
# There is unittest/ directory available, but not sure, how
# how to make it work.

%files
%defattr(-,root,root,-)
%doc README ChangeLog COPYING doc/
%{python_sitearch}/*

%changelog
* Fri Jul 18 2008 Matěj Cepl <mcepl at redhat.com> 0.1.2-3
- Fix building system.
- Approved for Fedora 

* Fri Jul 18 2008 Matěj Cepl <mcepl at redhat.com> 0.1.2-2
- Dan's patch to fix compilation flags.

* Thu Jul 17 2008 Matěj Cepl <mcepl at redhat.com> 0.1.2-1
- initial build