rpms/dia/devel dia-0.96-python-detect.patch, NONE, 1.1 dia.spec, 1.17, 1.18

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

Update of /cvs/extras/rpms/dia/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv3390

Modified Files:
	dia.spec 
Added Files:
	dia-0.96-python-detect.patch 
Log Message:
* Thu Mar 29 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1:0.96-1
- New upstream release 0.96
- Drop upstreamed python-25 and sigpipe patches


dia-0.96-python-detect.patch:

--- NEW FILE dia-0.96-python-detect.patch ---
--- dia-0.96/acinclude.m4~	2007-04-01 11:43:19.000000000 +0200
+++ dia-0.96/acinclude.m4	2007-04-01 11:43:19.000000000 +0200
@@ -225,7 +225,7 @@
 
 AC_MSG_CHECKING(for libpython${PYTHON_VERSION}.a)
 
-py_config_dir="$py_prefix/lib/python${PYTHON_VERSION}/config"
+py_config_dir="$pyexecdir/../config"
 
 py_makefile="${py_config_dir}/Makefile"
 if test -f "$py_makefile"; then
--- dia-0.96/configure~	2007-04-01 11:43:18.000000000 +0200
+++ dia-0.96/configure	2007-04-01 11:43:18.000000000 +0200
@@ -25152,7 +25152,7 @@
 echo "$as_me:$LINENO: checking for libpython${PYTHON_VERSION}.a" >&5
 echo $ECHO_N "checking for libpython${PYTHON_VERSION}.a... $ECHO_C" >&6
 
-py_config_dir="$py_prefix/lib/python${PYTHON_VERSION}/config"
+py_config_dir="$pyexecdir/../config"
 
 py_makefile="${py_config_dir}/Makefile"
 if test -f "$py_makefile"; then


Index: dia.spec
===================================================================
RCS file: /cvs/extras/rpms/dia/devel/dia.spec,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- dia.spec	29 Mar 2007 12:39:26 -0000	1.17
+++ dia.spec	1 Apr 2007 11:24:27 -0000	1.18
@@ -10,6 +10,7 @@
 Patch1:         dia-0.92.2-dtd.patch
 Patch2:         dia-0.95-pre6-help.patch
 Patch3:         dia-0.94-fallbacktoxpmicons.patch
+Patch4:         dia-0.96-python-detect.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:  libgnomeui-devel python-devel pygtk2-devel desktop-file-utils
 BuildRequires:  intltool docbook-utils docbook-style-dsssl docbook-style-xsl
@@ -30,6 +31,7 @@
 %patch1 -p1 -b .dtd
 %patch2 -p1 -b .help
 %patch3 -p1 -b .fallbacktoxpmicons
+%patch4 -p1 -b .py-detect
 sed -i 's|libdia_la_LDFLAGS = -avoid-version|libdia_la_LDFLAGS = -avoid-version $(shell pkg-config gtk+-2.0 libxml-2.0 libart-2.0 libgnome-2.0 --libs)|' \
   lib/Makefile.*
 chmod -x `find objects/AADL -type f`