rpms/libapreq2/F-13 libapreq2-2.12-install.patch, 1.1, 1.2 libapreq2.spec, 1.51, 1.52

[bojan]

Author: bojan

Update of /cvs/pkgs/rpms/libapreq2/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv18184

Modified Files:
	libapreq2-2.12-install.patch libapreq2.spec 
Log Message:
Fix linkage of Perl bindings: try again.

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

Index: libapreq2-2.12-install.patch
===================================================================
RCS file: /cvs/pkgs/rpms/libapreq2/F-13/libapreq2-2.12-install.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- libapreq2-2.12-install.patch	29 Mar 2010 14:14:40 -0000	1.1
+++ libapreq2-2.12-install.patch	22 Jun 2010 09:02:50 -0000	1.2
@@ -16,12 +16,13 @@ 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
+@@ -15,7 +15,9 @@ 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) \
++	cd perl; INSTALL=1 PKG_CONFIG_PATH=$(DESTDIR)$(libdir)/pkgconfig \
++		DESTDIR=$(DESTDIR) LIBDIR=$(libdir) \
 +		@PERL@ @PERL_OPTS@ Makefile.PL -apxs @APACHE2_APXS@ @MM_OPTS@
  	cd perl; $(MAKE) pure_install
  
@@ -29,16 +30,19 @@ diff -urp libapreq2-2.12/glue/Makefile.a
 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) {
+@@ -136,10 +136,15 @@ 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};
++    $apreq2_config = "PKG_CONFIG_PATH=$ENV{PKG_CONFIG_PATH} ".
++                     $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};
++    $apreq_libs = " -L".$ENV{DESTDIR}.$ENV{LIBDIR}." ".$apreq_libs
++                  if $ENV{INSTALL};
  }
  
  my $mp2_typemaps = Apache2::Build->new->typemaps;


Index: libapreq2.spec
===================================================================
RCS file: /cvs/pkgs/rpms/libapreq2/F-13/libapreq2.spec,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -p -r1.51 -r1.52
--- libapreq2.spec	29 Mar 2010 14:35:45 -0000	1.51
+++ libapreq2.spec	22 Jun 2010 09:02:50 -0000	1.52
@@ -2,7 +2,7 @@
 
 Name:           libapreq2
 Version:        2.12
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        Apache HTTP request library
 
 Group:          System Environment/Libraries
@@ -172,6 +172,9 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Tue Jun 22 2010 Bojan Smojver <bojan at rexursive.com> - 2.12-6
+- Fix linkage of Perl bindings: try again
+
 * Mon Mar 29 2010 Lubomir Rintel <lkundrak at v3.sk> - 2.12-5
 - Fix linkage of Perl bindings