packages (rpm-4_5): rpm/rpm.spec, rpm/rpm-pkgconfig.patch (NEW) - add rpm.p...

[glen]

Author: glen                         Date: Thu Oct 15 07:21:48 2009 GMT
Module: packages                      Tag: rpm-4_5
---- Log message:
- add rpm.pc; rel 28

---- Files affected:
packages/rpm:
   rpm.spec (1.837.2.42.2.49.2.71 -> 1.837.2.42.2.49.2.72) , rpm-pkgconfig.patch (NONE -> 1.1.2.1)  (NEW)

---- Diffs:

================================================================
Index: packages/rpm/rpm.spec
diff -u packages/rpm/rpm.spec:1.837.2.42.2.49.2.71 packages/rpm/rpm.spec:1.837.2.42.2.49.2.72
--- packages/rpm/rpm.spec:1.837.2.42.2.49.2.71	Sun Oct 11 20:35:49 2009
+++ packages/rpm/rpm.spec	Thu Oct 15 09:21:42 2009
@@ -56,7 +56,7 @@
 Summary(uk.UTF-8):	Менеджер пакетів від RPM
 Name:		rpm
 Version:	4.5
-Release:	27
+Release:	28
 License:	LGPL
 Group:		Base
 Source0:	%{name}-%{version}.tar.gz
@@ -174,6 +174,7 @@
 Patch96:	%{name}-disable-hkp.patch
 Patch97:	%{name}-sigpad.patch
 Patch98:	%{name}-debugdir.patch
+Patch99:	%{name}-pkgconfig.patch
 URL:		http://rpm5.org/
 BuildRequires:	autoconf >= 2.57
 BuildRequires:	automake >= 1.4
@@ -795,6 +796,7 @@
 %patch96 -p1
 %patch97 -p1
 %patch98 -p1
+%patch99 -p1
 
 mv -f po/{sr,sr at Latn}.po
 rm -rf sqlite zlib popt
@@ -1295,6 +1297,7 @@
 %{_libdir}/librpmdb.la
 %{_libdir}/librpmio.la
 %{_includedir}/rpm
+%{_pkgconfigdir}/rpm.pc
 
 %files static
 %defattr(644,root,root,755)
@@ -1449,6 +1452,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.837.2.42.2.49.2.72  2009/10/15 07:21:42  glen
+- add rpm.pc; rel 28
+
 Revision 1.837.2.42.2.49.2.71  2009/10/11 18:35:49  arekm
 - rel 27
 

================================================================
Index: packages/rpm/rpm-pkgconfig.patch
diff -u /dev/null packages/rpm/rpm-pkgconfig.patch:1.1.2.1
--- /dev/null	Thu Oct 15 09:21:48 2009
+++ packages/rpm/rpm-pkgconfig.patch	Thu Oct 15 09:21:42 2009
@@ -0,0 +1,36 @@
+--- rpm-4.5/Makefile.am~	2008-06-10 01:48:59.000000000 +0300
++++ rpm-4.5/Makefile.am	2009-10-15 00:00:46.263391619 +0300
+@@ -51,6 +51,15 @@
+ 
+ noinst_HEADERS = build.h debug.h system.h
+ 
++pkgconfigdir = $(libdir)/pkgconfig
++pkgconfig_DATA = rpm.pc
++rpm.pc: $(top_srcdir)/rpm.pc.in
++	@$(SED) \
++	  -e "s,[@]RPMCONFIGDIR[@],$(rpmconfigdir),g" \
++	  < $(top_srcdir)/rpm.pc.in > rpm.pc.tmp \
++	  && ( cd $(top_builddir) && ./config.status --file=${subdir}/rpm.pc:${subdir}/rpm.pc.tmp )
++EXTRA_DIST += rpm.pc.in
++
+ rpm_SOURCES =		$(top_srcdir)/build.c
+ rpm_LDFLAGS =		$(myLDFLAGS) $(staticLDFLAGS)
+ rpm_LDADD =		rpm.o $(top_builddir)/build/.libs/librpmbuild.a $(myLDADD)
+--- /dev/null	2007-02-13 18:29:53.000000000 +0200
++++ rpm/rpm.pc.in	2009-10-14 23:59:01.260069165 +0300
+@@ -0,0 +1,15 @@
++prefix=@prefix@
++exec_prefix=@exec_prefix@
++libdir=@libdir@
++includedir=@includedir@
++rpmhome=@RPMCONFIGDIR@
++
++Name: RPM
++Description: RPM Package Manager
++Version: @VERSION@
++URL: http://rpm5.org
++# Requires: 
++# Conflicts:
++Cflags: -I${includedir}
++Libs: -L${libdir} -lrpm -lrpmio
++Libs.private: -lpopt -lrt -lpthread @WITH_SELINUX_LIB@ @WITH_SQLITE3_LIB@ @WITH_DB_LIB@ @WITH_BZ2_LIB@ @WITH_ZLIB_LIB@ @WITH_NSS_LIB@ @WITH_LUA_LIB@
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/rpm/rpm.spec?r1=1.837.2.42.2.49.2.71&r2=1.837.2.42.2.49.2.72&f=u