rpms/tomoe-gtk/devel import.log, NONE, 1.1 tomoe-gtk-0.6.0-rpath.patch, NONE, 1.1 tomoe-gtk.spec, 1.4, 1.5

[Ding-Yi Chen]

Author: dchen

Update of /cvs/pkgs/rpms/tomoe-gtk/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv18944/devel

Modified Files:
	tomoe-gtk.spec 
Added Files:
	import.log tomoe-gtk-0.6.0-rpath.patch 
Log Message:
Fix Bug 499880: tomoe-gtk not built with \$RPM_OPT_FLAGS


--- NEW FILE import.log ---
tomoe-gtk-0_6_0-7_fc11:HEAD:tomoe-gtk-0.6.0-7.fc11.src.rpm:1242200726

tomoe-gtk-0.6.0-rpath.patch:

--- NEW FILE tomoe-gtk-0.6.0-rpath.patch ---
diff -up ./configure.ac.rpath ./configure.ac
--- ./configure.ac.rpath	2007-06-12 18:17:23.000000000 +1000
+++ ./configure.ac	2009-05-13 15:43:45.000000000 +1000
@@ -76,6 +76,14 @@ if test "x$GCC" = "xyes"; then
   fi
 fi
 
+# Add rpath check
+AC_MSG_CHECKING(whether to use rpath)
+AC_ARG_ENABLE(rpath,
+	[AC_HELP_STRING([--disable-rpath],
+			[Patches libtool to not use rpath in the libraries produced.])],
+	[xerces_cv_rpath="$enable_rpath"], [xerces_cv_rpath="yes"])
+AC_MSG_RESULT($xerces_cv_rpath)
+
 # for dump stroke data
 AC_ARG_ENABLE(dumpstroke, [  --enable-dumpstroke         Enable dump of stroke data])
 if test x"$enable_dumpstroke" = "xyes"; then
diff -up ./Makefile.am.rpath ./Makefile.am
--- ./Makefile.am.rpath	2007-06-07 15:36:06.000000000 +1000
+++ ./Makefile.am	2009-05-13 15:44:38.000000000 +1000
@@ -1,3 +1,4 @@
+ACLOCAL_AMFLAGS=-I macros
 SUBDIRS=src data po test doc bindings
 
 EXTRA_DIST = autogen.sh tomoe-gtk.pc


Index: tomoe-gtk.spec
===================================================================
RCS file: /cvs/pkgs/rpms/tomoe-gtk/devel/tomoe-gtk.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- tomoe-gtk.spec	25 Feb 2009 21:19:11 -0000	1.4
+++ tomoe-gtk.spec	13 May 2009 07:46:45 -0000	1.5
@@ -2,23 +2,29 @@
 
 Name:           tomoe-gtk
 Version:        0.6.0
-Release:        5%{?dist}
+Release:        7%{?dist}
 Summary:        Gtk library for tomoe for Japanese and Chinese handwritten input
 
 Group:          System Environment/Libraries
 License:        LGPLv2+
 URL:            http://scim-imengine.sourceforge.jp/
 Source0:        http://dl.sourceforge.net/sourceforge/tomoe/%{name}-%{version}.tar.gz
+Patch0:         %{name}-0.6.0-rpath.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Requires:       tomoe >= %{tomoe_ver}
 Obsoletes:      libtomoe-gtk < 0.6.0-4
-BuildRequires:  tomoe-devel >= %{tomoe_ver}, gtk2-devel, 
+BuildRequires:  libtool 
+BuildRequires:  tomoe-devel >= %{tomoe_ver}, gtk2-devel, pygtk2-devel
 # does not currently build with gucharmap-2
 #BuildRequires:  gucharmap-devel
 BuildRequires:  libgnomeui-devel, pygobject2-devel
 BuildRequires:  gettext
 
+%{!?pyver: %define pyver %(python -c 'import sys; print(sys.version[0:3])')}
+%{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
+%define project_python_dir %{python_sitearch}/%{name}
+
 %description
 Gtk library for tomoe Japanese handwritten input.
 This package is used by scim-tomoe or uim-tomoe.
@@ -41,11 +47,13 @@ Install this if you want to develop prog
 
 %prep
 %setup -q
+%patch0 -p0 -b .rpath
 
 
 %build
-%configure --disable-static --without-gucharmap
-make %{?_smp_mflags}
+autoreconf -iv
+%configure --disable-static --without-gucharmap --disable-dependency-tracking --disable-rpath
+make %{?_smp_mflags} RPM_CFLAGS="$RPM_OPT_FLAGS"
 
 
 %install
@@ -53,6 +61,7 @@ rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
 rm $RPM_BUILD_ROOT%{_libdir}/*.la
+rm $RPM_BUILD_ROOT%{python_sitearch}/gtk-2.0/tomoegtk.la
 
 %find_lang %{name}
 
@@ -87,9 +96,20 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/lib%{name}.so
 %{_includedir}/tomoe/*
 %{_datadir}/gtk-doc/html/lib%{name}/
-
+%{python_sitearch}/gtk-2.0/tomoegtk.so
 
 %changelog
+* Wed May 13 2009 Ding-Yi Chen <dchen at redhat.com> - 0.6.0-7
+- Fixed RH Bug 499880: tomoe-gtk not built with $RPM_OPT_FLAGS
+- Add libtool BuildRequires.
+- Fixed rpath issues.
+- Add tomoegtk.so
+
+* Fri May  8 2009 Ville Skyttä <ville.skytta at iki.fi> - 0.6.0-6
+- Build with $RPM_OPT_FLAGS (patch to avoid discarding user set $CFLAGS).
+- Disable autotools dependency tracking during build for cleaner build logs
+  and possible slight build speedup.
+
 * Wed Feb 25 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.6.0-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild