- add rpm.pc; rel 28

Changed files:
    rpm-pkgconfig.patch -> 1.1.2.1
    rpm.spec -> 1.837.2.42.2.49.2.72

diff --git a/rpm-pkgconfig.patch b/rpm-pkgconfig.patch
new file mode 100644 (file)
index 0000000..56aa208
--- /dev/null
+++ b/rpm-pkgconfig.patch
@@ -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@

diff --git a/rpm.spec b/rpm.spec
index cc4406db8f93a07d56c712e1db5a81843caa1ad2..f81788948dc17cbca6d3e8cd8da32f615bb97df0 100644 (file)
--- a/rpm.spec
+++ b/rpm.spec
@@ -55,7 +55,7 @@ Summary(ru.UTF-8):    Менеджер пакетов от RPM
 Summary(uk.UTF-8):     Менеджер пакетів від RPM
 Name:          rpm
 Version:       4.5
-Release:       27
+Release:       28
 License:       LGPL
 Group:         Base
 Source0:       %{name}-%{version}.tar.gz
@@ -173,6 +173,7 @@ Patch95:    %{name}-gid-uucp.patch
 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
@@ -794,6 +795,7 @@ install %{SOURCE13} scripts/perl.prov
 %patch96 -p1
 %patch97 -p1
 %patch98 -p1
+%patch99 -p1
 
 mv -f po/{sr,sr@Latn}.po
 rm -rf sqlite zlib popt
@@ -1294,6 +1296,7 @@ find %{_rpmlibdir} -name '*-linux' -type l | xargs rm -f
 %{_libdir}/librpmdb.la
 %{_libdir}/librpmio.la
 %{_includedir}/rpm
+%{_pkgconfigdir}/rpm.pc
 
 %files static
 %defattr(644,root,root,755)