OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /e/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src openpkg-web Date: 05-Jan-2004 14:28:33
Branch: HEAD Handle: 2004010513283102
Modified files:
openpkg-src/openpkg HISTORY openpkg.spec rpm.patch.bugfix
rpm.patch.feature rpm.patch.porting
rpm.patch.regen
openpkg-web news.txt
Log:
exclude %doc flagged files by default and regenerate fixed patch files
Summary:
Revision Changes Path
1.102 +2 -0 openpkg-src/openpkg/HISTORY
1.259 +1 -1 openpkg-src/openpkg/openpkg.spec
1.36 +21 -18 openpkg-src/openpkg/rpm.patch.bugfix
1.37 +33 -26 openpkg-src/openpkg/rpm.patch.feature
1.45 +12 -14 openpkg-src/openpkg/rpm.patch.porting
1.35 +5 -5 openpkg-src/openpkg/rpm.patch.regen
1.7979 +1 -0 openpkg-web/news.txt
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/HISTORY
============================================================================
$ cvs diff -u -r1.101 -r1.102 HISTORY
--- openpkg-src/openpkg/HISTORY 1 Jan 2004 19:19:07 -0000 1.101
+++ openpkg-src/openpkg/HISTORY 5 Jan 2004 13:28:32 -0000 1.102
@@ -2,6 +2,8 @@
2004
====
+20040105 exclude %doc flagged files by default.
+20040102 make sure rpmtool exists (important on bootstrapping with openpkg.boot)
20040101 start using the global file /etc/openpkg to register all OpenPKG instances
on a system
2003
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/openpkg.spec
============================================================================
$ cvs diff -u -r1.258 -r1.259 openpkg.spec
--- openpkg-src/openpkg/openpkg.spec 2 Jan 2004 15:53:00 -0000 1.258
+++ openpkg-src/openpkg/openpkg.spec 5 Jan 2004 13:28:32 -0000 1.259
@@ -39,7 +39,7 @@
# o any cc(1)
# the package version/release
-%define V_openpkg 20040102
+%define V_openpkg 20040105
# the used software versions
%define V_rpm 4.2.1
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.bugfix
============================================================================
$ cvs diff -u -r1.35 -r1.36 rpm.patch.bugfix
--- openpkg-src/openpkg/rpm.patch.bugfix 28 Oct 2003 15:59:20 -0000 1.35
+++ openpkg-src/openpkg/rpm.patch.bugfix 5 Jan 2004 13:28:32 -0000 1.36
@@ -10,7 +10,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 28-Oct-2003
+## Created on: 05-Jan-2004
##
## ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
## RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.
@@ -24,23 +24,26 @@
Index: build/parsePrep.c
--- build/parsePrep.c 7 Aug 2002 14:20:45 -0000 1.1.1.10
+++ build/parsePrep.c 16 Sep 2003 15:17:44 -0000
-@@ -264,11 +298,14 @@
- "fi");
- } else {
- buf[0] = '\0';
-- t = stpcpy( stpcpy(buf, "tar "), taropts);
-- *t++ = ' ';
-+ t = stpcpy(buf, tar);
-+ t = stpcpy(t, " ");
-+ t = stpcpy(t, taropts);
-+ t = stpcpy(t, " ");
- t = stpcpy(t, fn);
- }
-
-+ tar = _free(tar);
- urlfn = _free(urlfn);
- return buf;
- }
+@@ -584,12 +621,15 @@
+ saveLines = splitString(getStringBuf(sb), strlen(getStringBuf(sb)), '\n');
+ /[EMAIL PROTECTED]@*/
+ for (lines = saveLines; *lines; lines++) {
++ char *cp;
++ for (cp = *lines; *cp == ' ' || *cp == '\t'; cp++)
++ ;
+ res = 0;
+ /[EMAIL PROTECTED]@*/
+- if (! strncmp(*lines, "%setup", sizeof("%setup")-1)) {
+- res = doSetupMacro(spec, *lines);
+- } else if (! strncmp(*lines, "%patch", sizeof("%patch")-1)) {
+- res = doPatchMacro(spec, *lines);
++ if (! strncmp(cp, "%setup", sizeof("%setup")-1)) {
++ res = doSetupMacro(spec, cp);
++ } else if (! strncmp(cp, "%patch", sizeof("%patch")-1)) {
++ res = doPatchMacro(spec, cp);
+ } else {
+ appendLineStringBuf(spec->prep, *lines);
+ }
+---------------------------------------------------------------------------
| Do not pick of the vendor BeeCrypt package on RedHat Linux.
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.feature
============================================================================
$ cvs diff -u -r1.36 -r1.37 rpm.patch.feature
--- openpkg-src/openpkg/rpm.patch.feature 28 Oct 2003 15:59:20 -0000 1.36
+++ openpkg-src/openpkg/rpm.patch.feature 5 Jan 2004 13:28:32 -0000 1.37
@@ -10,7 +10,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 28-Oct-2003
+## Created on: 05-Jan-2004
##
## ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
## RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.
@@ -339,10 +339,11 @@
Index: build/build.c
--- build/build.c 4 Mar 2003 15:27:33 -0000 1.1.1.20
+++ build/build.c 15 Sep 2003 19:02:34 -0000
-@@ -338,6 +356,21 @@
+@@ -337,6 +355,21 @@
+
if (what & RPMBUILD_RMSPEC)
(void) Unlink(spec->specFile);
-
++
+#ifdef OPENPKG
+ if (what & RPMBUILD_RMSOURCE) {
+ const char *pn;
@@ -357,10 +358,9 @@
+ pn = _free(pn);
+ }
+#endif
-+
+
exit:
if (rc && rpmlogGetNrecs() > 0) {
- rpmMessage(RPMMESS_NORMAL, _("\n\nRPM build errors:\n"));
+---------------------------------------------------------------------------
| Make sure the "Provides" headers are available for querying from the
@@ -571,26 +571,23 @@
t = stpcpy(t,
"\n"
"STATUS=$?\n"
-@@ -584,12 +621,15 @@
- saveLines = splitString(getStringBuf(sb), strlen(getStringBuf(sb)), '\n');
- /[EMAIL PROTECTED]@*/
- for (lines = saveLines; *lines; lines++) {
-+ char *cp;
-+ for (cp = *lines; *cp == ' ' || *cp == '\t'; cp++)
-+ ;
- res = 0;
- /[EMAIL PROTECTED]@*/
-- if (! strncmp(*lines, "%setup", sizeof("%setup")-1)) {
-- res = doSetupMacro(spec, *lines);
-- } else if (! strncmp(*lines, "%patch", sizeof("%patch")-1)) {
-- res = doPatchMacro(spec, *lines);
-+ if (! strncmp(cp, "%setup", sizeof("%setup")-1)) {
-+ res = doSetupMacro(spec, cp);
-+ } else if (! strncmp(cp, "%patch", sizeof("%patch")-1)) {
-+ res = doPatchMacro(spec, cp);
- } else {
- appendLineStringBuf(spec->prep, *lines);
- }
+@@ -264,11 +298,14 @@
+ "fi");
+ } else {
+ buf[0] = '\0';
+- t = stpcpy( stpcpy(buf, "tar "), taropts);
+- *t++ = ' ';
++ t = stpcpy(buf, tar);
++ t = stpcpy(t, " ");
++ t = stpcpy(t, taropts);
++ t = stpcpy(t, " ");
+ t = stpcpy(t, fn);
+ }
+
++ tar = _free(tar);
+ urlfn = _free(urlfn);
+ return buf;
+ }
+---------------------------------------------------------------------------
| Add support for splitted source directories, i.e., source files
@@ -950,6 +947,7 @@
canon = lookupInCanonTable(un.machine,
+---------------------------------------------------------------------------
+| Enable the exlusion of "%doc" files by default.
| Disable "check-files" feature, because it is useless in OpenPKG
| (we consistently use BuildRoot and our %files lists are fully
| autogenerated) and just makes problems on bootstrapping.
@@ -969,7 +967,16 @@
+---------------------------------------------------------------------------
Index: macros.in
--- macros.in 2 Jul 2003 19:20:52 -0000 1.1.1.14
-+++ macros.in 10 Oct 2003 18:10:14 -0000
++++ macros.in 5 Jan 2004 10:40:15 -0000
+@@ -206,7 +206,7 @@
+
+ # Boolean (i.e. 1 == "yes", 0 == "no") that controls whether files
+ # marked as %doc should be installed.
+-#%_excludedocs
++%_excludedocs 1
+
+ # The port and machine name of a FTP proxy host running TIS firewall.
+ #
@@ -305,7 +305,7 @@
# Returns list of unpackaged files, i.e. files in $RPM_BUILD_ROOT not packaged.
#
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.porting
============================================================================
$ cvs diff -u -r1.44 -r1.45 rpm.patch.porting
--- openpkg-src/openpkg/rpm.patch.porting 28 Oct 2003 15:59:20 -0000 1.44
+++ openpkg-src/openpkg/rpm.patch.porting 5 Jan 2004 13:28:32 -0000 1.45
@@ -10,7 +10,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 28-Oct-2003
+## Created on: 05-Jan-2004
##
## ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
## RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.
@@ -177,16 +177,16 @@
# endif
filesystems = xcalloc((numAlloced + 1), sizeof(*filesystems)); /* XXX memory
leak */
-@@ -193,6 +199,9 @@
+@@ -191,6 +197,9 @@
+ if (getmntent(mtab, &item)) break;
+ mntdir = item.our_mntdir;
# elif HAVE_GETMNTINFO_R
- if (nextMount == mntCount) break;
- mntdir = mounts[nextMount++].f_mntonname;
-+# elif HAVE_GETMNTINFO
+ if (nextMount == mntCount) break;
+ mntdir = mounts[nextMount++].f_mntonname;
++# elif HAVE_GETMNTINFO
+ if (nextMount == mntCount) break;
+ mntdir = mounts[nextMount++].f_mntonname;
# endif
-
- if (stat(mntdir, &sb)) {
+---------------------------------------------------------------------------
| Add support for Compaq/HP OSF1/Tru64.
@@ -935,7 +935,7 @@
Index: system.h
--- system.h 1 Mar 2003 19:53:08 -0000 1.1.1.10
+++ system.h 27 Aug 2003 13:07:49 -0000
-@@ -603,11 +599,16 @@
+@@ -603,9 +599,14 @@
#if defined(__LCLINT__)
#define FILE_RCSID(id)
@@ -943,16 +943,14 @@
+#elif defined(__GNUC__)
#define FILE_RCSID(id) \
static inline const char *rcsid(const char *p) { \
- return rcsid(p = id); \
- }
++ return rcsid(p = id); \
++}
+#else
+#define FILE_RCSID(id) \
+static const char *rcsid(const char *p) { \
-+ return rcsid(p = id); \
-+}
+ return rcsid(p = id); \
+ }
#endif
-
- #endif /* H_SYSTEM */
+---------------------------------------------------------------------------
| Remove GCC'ism.
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/openpkg/rpm.patch.regen
============================================================================
$ cvs diff -u -r1.34 -r1.35 rpm.patch.regen
--- openpkg-src/openpkg/rpm.patch.regen 28 Oct 2003 15:59:20 -0000 1.34
+++ openpkg-src/openpkg/rpm.patch.regen 5 Jan 2004 13:28:33 -0000 1.35
@@ -10,7 +10,7 @@
## 'patch' tool to upgrade those files. Each patch snippet is annotated
## with a short description.
##
-## Created on: 28-Oct-2003
+## Created on: 05-Jan-2004
##
## ATTENTION: THIS PATCH FILE WAS AUTO-GENERATED FROM AN OPENPKG
## RPM CVS REPOSITORY, HENCE DO NOT EDIT THIS FILE.
@@ -82,10 +82,11 @@
/* Define to 1 if you have the `tsearch' function. */
#undef HAVE_TSEARCH
-@@ -586,6 +574,15 @@
+@@ -585,6 +573,15 @@
+
/* Define to `unsigned' if <sys/types.h> does not define. */
#undef size_t
-
++
+/* uint16_t */
+#undef uint16_t
+
@@ -94,10 +95,9 @@
+
+/* uint8_t */
+#undef uint8_t
-+
+
/* Define to unsigned long or unsigned long long if <inttypes.h> and
<stdint.h> don't define. */
- #undef uintmax_t
+---------------------------------------------------------------------------
| Corresponding patches in "configure" script after regeneration from
@@ .
patch -p0 <<'@@ .'
Index: openpkg-web/news.txt
============================================================================
$ cvs diff -u -r1.7978 -r1.7979 news.txt
--- openpkg-web/news.txt 5 Jan 2004 12:58:45 -0000 1.7978
+++ openpkg-web/news.txt 5 Jan 2004 13:28:31 -0000 1.7979
@@ -1,3 +1,4 @@
+05-Jan-2004: Upgraded package: P<openpkg-20040105-20040105>
05-Jan-2004: New package: P<offlineimap-4.0.0-20040105>
05-Jan-2004: Upgraded package: P<pgpdump-0.20-20040105>
05-Jan-2004: New package: P<meta-ldap-20040105-20040105>
@@ .
______________________________________________________________________
The OpenPKG Project www.openpkg.org
CVS Repository Commit List [EMAIL PROTECTED]
