From f6aa54688c13665bf0c86ee87bbae9902b28bfd9 Mon Sep 17 00:00:00 2001
From: jbj <devnull@localhost>
Date: Sat, 12 Sep 1998 13:29:10 +0000
Subject: [PATCH] restore backward compatible rpmrc/rpmpopt symlinks.

CVS patchset: 2298
CVS date: 1998/09/12 13:29:10
---
 CHANGES     | 14 ++++++++------
 Makefile.in |  2 ++
 rpm.spec    |  2 ++
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/CHANGES b/CHANGES
index 2b7686a..d46f6e8 100644
--- a/CHANGES
+++ b/CHANGES
@@ -10,20 +10,20 @@
 	- aggregate system includes into system.h.
 	- rearrange functions to minimize exported routines in librpmbuild API.
 	- generalize cpio I/O to eliminate pipe to exec'd gzip on install.
-	- finish planting /usr/lib/rpm (remove compatibility symlinks)
-	- add new fully recursive macro.c
 	- add {init,add,expand}Macro args everywhere (new macro.c compatibility)
-	- create /usr/lib/rpm directory and move rpmrc et al there
+	- add new fully recursive macro.c
 
 2.5.3 -> 2.5.4:
+	- restore backward compatible rpmrc/rpmpopt symlinks.
 	- update pt_BR translations (Arnaldo Carvalho de Melo).
 	- permit --{buildroot,timecheck,test,sign} with -tX (Toshio Kuratomi).
 	- fix database rebuilds with triggers (Steve Sanberg).
 	- diagnostic message if unreadable/short source or patch file.
 	- eliminate redundant close in provide/require processing.
 	- solaris portability patch resurrection (Steve Sanberg).
-	- add %license/%readme virtual file attributes
-        - align "Build Host:" with other fields
+	- permit autogen.sh to work on non "prefix=/usr" hosts.
+	- add %license/%readme virtual file attributes.
+        - align "Build Host:" with other fields.
 
 2.5.2 -> 2.5.3:
 	- copy changelog tags to sub-packages just before packaging.
@@ -32,7 +32,7 @@
 	- fix infinite recursion on non-ERANGE return from getcwd() during
 	  install (Matt Wilson).
 	- rm .depend for multiple builds in same tree (Will Partain)
-	- add special case code for "/" in %files.
+	- addFile: fix special case of "/" in %files.
 	- better query semantics with symlinks (Tim Mooney)
 	- build.c: fix incorrect check for successful open
 	- allow %define with leading whitespace
@@ -47,6 +47,8 @@
 	- fixed --triggers alias (Michael Andres)
 	- added :hex query format
 	- fixed --querytags to display virtual tags
+?????	- added --triggers and --triggered by to man page, help, and usage
+?????	- added support for epochs
 
 2.5.1 -> 2.5.2:
 	- added -bs to build just a source package
diff --git a/Makefile.in b/Makefile.in
index 42795af..2538e93 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -138,6 +138,8 @@ install: all
 	$(INSTALL_DATA) -m 644 $(topdir)/macros $(installprefix)/$(RPMCONFIGDIR)/macros
 	$(INSTALL_DATA) -m 644 $(topdir)/lib-rpmrc $(installprefix)/$(RPMCONFIGDIR)/rpmrc
 	$(INSTALL_DATA) -m 644 $(srcdir)/rpmpopt $(installprefix)/$(RPMCONFIGDIR)/rpmpopt
+	ln -sf $(RPMCONFIGDIR)/rpmrc $(installprefix)/$(LIBDIR)/rpmrc
+	ln -sf $(RPMCONFIGDIR)/rpmpopt $(installprefix)/$(LIBDIR)/rpmpopt
 	(cd lib; $(MAKE) LIBDIR=$(installprefix)/$(LIBDIR) INCDIR=$(installprefix)/$(INCDIR) install)
 	(cd build; $(MAKE) LIBDIR=$(installprefix)/$(LIBDIR) INCDIR=$(installprefix)/$(INCDIR) install)
 	for d in $(INSTSUBDIRS); do \
diff --git a/rpm.spec b/rpm.spec
index 3578cd5..56ddb4c 100644
--- a/rpm.spec
+++ b/rpm.spec
@@ -63,6 +63,8 @@ rm -rf $RPM_BUILD_ROOT
 /usr/man/man8/rpm.8
 /usr/man/man8/rpm2cpio.8
 /usr/lib/rpm
+/usr/lib/rpmrc
+/usr/lib/rpmpopt
 %dir /usr/src/redhat
 %dir /usr/src/redhat/BUILD
 %dir /usr/src/redhat/SPECS
-- 
2.7.4