rpms/libapreq2/devel libapreq2-2.12-install.patch, NONE, 1.1 libapreq2.spec, 1.49, 1.50

[Lubomir Rintel]

Author: lkundrak

Update of /cvs/pkgs/rpms/libapreq2/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv24897

Modified Files:
	libapreq2.spec 
Added Files:
	libapreq2-2.12-install.patch 
Log Message:
* Mon Mar 29 2010 Lubomir Rintel <lkundrak at v3.s> - 2.12-4
- Fix linkage of Perl bindings


libapreq2-2.12-install.patch:
 Makefile.am      |    3 ++-
 perl/Makefile.PL |    4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

--- NEW FILE libapreq2-2.12-install.patch ---
From: Lubomir Rintel <lkundrak at v3.sk>

APR shared objects were not properly linked when they were installed to a
specific DESTDIR. This was broken in r733406, which attempted to fix
rpaths for the obscure platforms that still use them.

With this applied, we call apreq2-config we just installed and add a library
path of libraries in DESTDIR to linker.

$ perl -MAPR::Request
Can't load '/usr/lib/perl5/auto/APR/Request/Request.so' for module APR::Request: /usr/lib/perl5/auto/APR/Request/Request.so: undefined symbol: apreq_hook_disable_uploads at /usr/lib/perl5/DynaLoader.pm line 200.
 at - line 0
Compilation failed in require.
BEGIN failed--compilation aborted.

diff -urp libapreq2-2.12/glue/Makefile.am libapreq2-2.12.fixed/glue/Makefile.am
--- libapreq2-2.12/glue/Makefile.am	2010-03-29 15:59:03.615820329 +0200
+++ libapreq2-2.12.fixed/glue/Makefile.am	2010-03-29 15:57:49.360849733 +0200
@@ -15,7 +15,8 @@ perl_test: perl/Makefile
 	cd perl; $(MAKE) test
 
 perl_install:
-	cd perl; INSTALL=1 @PERL@ @PERL_OPTS@ Makefile.PL -apxs @APACHE2_APXS@ @MM_OPTS@
+	cd perl; INSTALL=1 DESTDIR=$(DESTDIR) LIBDIR=$(libdir) \
+		@PERL@ @PERL_OPTS@ Makefile.PL -apxs @APACHE2_APXS@ @MM_OPTS@
 	cd perl; $(MAKE) pure_install
 
 perl_clean:
diff -urp libapreq2-2.12/glue/perl/Makefile.PL libapreq2-2.12.fixed/glue/perl/Makefile.PL
--- libapreq2-2.12/glue/perl/Makefile.PL	2010-03-29 15:59:03.632820608 +0200
+++ libapreq2-2.12.fixed/glue/perl/Makefile.PL	2010-03-29 15:56:26.725851479 +0200
@@ -136,10 +136,12 @@ if (WIN32) {
     my $apreq2_config = "$base_dir/apreq2-config";
     my $bindir = qx{$apreq2_config --bindir};
     chomp $bindir;
-    $apreq2_config = "$bindir/apreq2-config" if $ENV{INSTALL};
+    $apreq2_config = $ENV{DESTDIR}."$bindir/apreq2-config" if $ENV{INSTALL};
     $apreq_libs = qx{$apreq2_config --link-ld --ldflags --libs};
+    die "Failed to run $apreq2_config" if $?;
     chomp $apreq_libs;
+    $apreq_libs .= " -L".$ENV{DESTDIR}.$ENV{LIBDIR} if $ENV{INSTALL};
 }
 
 my $mp2_typemaps = Apache2::Build->new->typemaps;


Index: libapreq2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libapreq2/devel/libapreq2.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- libapreq2.spec	6 Dec 2009 23:12:12 -0000	1.49
+++ libapreq2.spec	29 Mar 2010 14:14:38 -0000	1.50
@@ -2,7 +2,7 @@
 
 Name:           libapreq2
 Version:        2.12
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Apache HTTP request library
 
 Group:          System Environment/Libraries
@@ -14,6 +14,7 @@ Source2:        %{name}.pc.in
 Patch0:         %{name}-build.patch
 Patch1:         %{name}-2.07-rc3-ldflags.patch
 Patch2:         %{name}-2.09-pkgconfig.patch
+Patch3:         %{name}-2.12-install.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  httpd-devel >= 2.0.48
@@ -88,6 +89,7 @@ apuver=$(apu-1-config --version || apu-c
 %patch0
 %patch1
 %patch2
+%patch3 -p1
 
 cp %{SOURCE2} .
 
@@ -114,9 +116,9 @@ sed -i -e 's,^libdir=.*,libdir="`pkg-con
 
 %install
 rm -rf $RPM_BUILD_ROOT __docs
-make install DESTDIR=$RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT%{_libdir}/pkgconfig
 install -m 644 %{name}.pc $RPM_BUILD_ROOT%{_libdir}/pkgconfig
+PKG_CONFIG_LIBDIR=$RPM_BUILD_ROOT%{_libdir} make install DESTDIR=$RPM_BUILD_ROOT
 install -Dpm 644 %{SOURCE1} \
   $RPM_BUILD_ROOT%{_sysconfdir}/httpd/conf.d/apreq.conf
 cp -pR docs/html __docs ; rm __docs/installdox
@@ -170,6 +172,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Mar 29 2010 Lubomir Rintel <lkundrak at v3.s> - 2.12-4
+- Fix linkage of Perl bindings
+
 * Fri Dec  4 2009 Stepan Kasal <skasal at redhat.com> - 2.12-3
 - rebuild against perl 5.10.1