Sync with rpm-4_0 branch.

CVS patchset: 4361
CVS date: 2000/12/19 23:22:00

12 files changed, 23 insertions, 23 deletions

diff --git a/popt/acconfig.h b/popt/acconfig.h
index 7fe3ea9f7..10965f1a1 100644
--- a/popt/acconfig.h
+++ b/popt/acconfig.h
@@ -1,6 +1,6 @@
-/* (C) 1998 Red Hat Software, Inc. -- Licensing details are in the COPYING
+/* (C) 1998-2000 Red Hat, Inc. -- Licensing details are in the COPYING
    file accompanying popt source distributions, available from 
-   ftp://ftp.redhat.com/pub/code/popt */
+   ftp://ftp.rpm.org/pub/rpm/dist. */
 
 /* acconfig.h
    This file is in the public domain.
diff --git a/popt/findme.c b/popt/findme.c
index b5878a12b..e65762dbc 100644
--- a/popt/findme.c
+++ b/popt/findme.c
@@ -2,9 +2,9 @@
  * \file popt/findme.c
  */
 
-/* (C) 1998 Red Hat Software, Inc. -- Licensing details are in the COPYING
+/* (C) 1998-2000 Red Hat, Inc. -- Licensing details are in the COPYING
    file accompanying popt source distributions, available from 
-   ftp://ftp.redhat.com/pub/code/popt */
+   ftp://ftp.rpm.org/pub/rpm/dist. */
 
 #include "system.h"
 #include "findme.h"
diff --git a/popt/findme.h b/popt/findme.h
index 78f714ee5..44ec80168 100644
--- a/popt/findme.h
+++ b/popt/findme.h
@@ -2,9 +2,9 @@
  * \file popt/findme.h
  */
 
-/* (C) 1998 Red Hat Software, Inc. -- Licensing details are in the COPYING
+/* (C) 1998-2000 Red Hat, Inc. -- Licensing details are in the COPYING
    file accompanying popt source distributions, available from 
-   ftp://ftp.redhat.com/pub/code/popt */
+   ftp://ftp.rpm.org/pub/rpm/dist. */
 
 #ifndef H_FINDME
 #define H_FINDME
diff --git a/popt/po/popt.pot b/popt/po/popt.pot
index 6e3a15bbb..b15489b25 100644
--- a/popt/po/popt.pot
+++ b/popt/po/popt.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-09-11 12:53-0400\n"
+"POT-Creation-Date: 2000-12-19 18:05-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/popt/popt.c b/popt/popt.c
index 3fd6361c3..6c4100cef 100644
--- a/popt/popt.c
+++ b/popt/popt.c
@@ -2,9 +2,9 @@
  * \file popt/popt.c
  */
 
-/* (C) 1998 Red Hat Software, Inc. -- Licensing details are in the COPYING
+/* (C) 19982000 Red Hat, Inc. -- Licensing details are in the COPYING
    file accompanying popt source distributions, available from
-   ftp://ftp.redhat.com/pub/code/popt */
+   ftp://ftp.rpm.org/pub/rpm/dist */
 
 #undef	MYDEBUG
 
diff --git a/popt/popt.h b/popt/popt.h
index d4dd489ae..7a0a6b1b6 100644
--- a/popt/popt.h
+++ b/popt/popt.h
@@ -2,9 +2,9 @@
  * \file popt/popt.h
  */
 
-/* (C) 1998 Red Hat Software, Inc. -- Licensing details are in the COPYING
+/* (C) 1998-2000 Red Hat, Inc. -- Licensing details are in the COPYING
    file accompanying popt source distributions, available from 
-   ftp://ftp.redhat.com/pub/code/popt */
+   ftp://ftp.rpm.org/pub/rpm/dist. */
 
 #ifndef H_POPT
 #define H_POPT
diff --git a/popt/popt.spec b/popt/popt.spec
index a417aeb75..5c2329558 100644
--- a/popt/popt.spec
+++ b/popt/popt.spec
@@ -4,9 +4,9 @@
 #
 Summary: A C library for parsing command line parameters.
 Name: popt
-Version: 1.7
+Version: 1.6.1
 Release: 0.1
-Copyright: LGPL
+Copyright: X Consortium
 Group: System Environment/Libraries
 Source: ftp://ftp.redhat.com/pub/redhat/code/popt/popt-%{version}.tar.gz
 BuildRoot: /var/tmp/%{name}root
diff --git a/popt/poptconfig.c b/popt/poptconfig.c
index 9e50b528d..0cfd1a1db 100644
--- a/popt/poptconfig.c
+++ b/popt/poptconfig.c
@@ -2,9 +2,9 @@
  * \file popt/poptconfig.c
  */
 
-/* (C) 1998 Red Hat Software, Inc. -- Licensing details are in the COPYING
+/* (C) 1998-2000 Red Hat, Inc. -- Licensing details are in the COPYING
    file accompanying popt source distributions, available from 
-   ftp://ftp.redhat.com/pub/code/popt */
+   ftp://ftp.rpm.org/pub/rpm/dist. */
 
 #include "system.h"
 #include "poptint.h"
diff --git a/popt/popthelp.c b/popt/popthelp.c
index 8eed7eeb5..c88d09440 100644
--- a/popt/popthelp.c
+++ b/popt/popthelp.c
@@ -4,9 +4,9 @@
  * \file popt/popthelp.c
  */
 
-/* (C) 1998 Red Hat Software, Inc. -- Licensing details are in the COPYING
+/* (C) 1998-2000 Red Hat, Inc. -- Licensing details are in the COPYING
    file accompanying popt source distributions, available from 
-   ftp://ftp.redhat.com/pub/code/popt */
+   ftp://ftp.rpm.org/pub/rpm/dist. */
 
 #include "system.h"
 #include "poptint.h"
diff --git a/popt/poptint.h b/popt/poptint.h
index 39ae3ee4e..a37a9b925 100644
--- a/popt/poptint.h
+++ b/popt/poptint.h
@@ -2,9 +2,9 @@
  * \file popt/poptint.h
  */
 
-/* (C) 1998 Red Hat Software, Inc. -- Licensing details are in the COPYING
+/* (C) 1998-2000 Red Hat, Inc. -- Licensing details are in the COPYING
    file accompanying popt source distributions, available from 
-   ftp://ftp.redhat.com/pub/code/popt */
+   ftp://ftp.rpm.org/pub/rpm/dist. */
 
 #ifndef H_POPTINT
 #define H_POPTINT
diff --git a/popt/poptparse.c b/popt/poptparse.c
index 7a2d50545..9133c365b 100644
--- a/popt/poptparse.c
+++ b/popt/poptparse.c
@@ -2,9 +2,9 @@
  * \file popt/poptparse.c
  */
 
-/* (C) 1998 Red Hat Software, Inc. -- Licensing details are in the COPYING
+/* (C) 1998-2000 Red Hat, Inc. -- Licensing details are in the COPYING
    file accompanying popt source distributions, available from 
-   ftp://ftp.redhat.com/pub/code/popt */
+   ftp://ftp.rpm.org/pub/rpm/dist. */
 
 #include "system.h"
 
diff --git a/popt/test1.c b/popt/test1.c
index fdd3a4ab6..5b6aeb723 100644
--- a/popt/test1.c
+++ b/popt/test1.c
@@ -1,6 +1,6 @@
-/* (C) 1998 Red Hat Software, Inc. -- Licensing details are in the COPYING
+/* (C) 1998-2000 Red Hat, Inc. -- Licensing details are in the COPYING
    file accompanying popt source distributions, available from
-   ftp://ftp.redhat.com/pub/code/popt */
+   ftp://ftp.rpm.org/pub/rpm/dist. */
 
 #include "system.h"