[Lsb-messages] /var/www/bzr/lsb/devel/appbat r1028: update libbat a bit - gdbm, bzip2 uplifted

Mats Wichmann mats at linuxfoundation.org
Sat Apr 15 19:24:20 UTC 2017


------------------------------------------------------------
revno: 1028
committer: Mats Wichmann <mats at linuxfoundation.org>
branch nick: appbat
timestamp: Sat 2017-04-15 13:24:20 -0600
message:
  update libbat a bit - gdbm, bzip2 uplifted
modified:
  entities/package
  extras/md5sums
  extras/package_locations
  rpm/lsb-build-libbat.spec
-------------- next part --------------
=== modified file 'entities/package'
--- a/entities/package	2013-02-13 15:22:34 +0000
+++ b/entities/package	2017-04-15 19:24:20 +0000
@@ -28,8 +28,9 @@
 <!ENTITY expect-patch "expect-5.43.patch">
 <!ENTITY expecttcl-patch "expect-tcl8.5.patch">
 
-<!ENTITY xpdf-version "1.01">			<!-- current is 2.03 -->
-<!ENTITY xpdf-package "xpdf-1.01.tar.gz">	<!-- don't update -->
+<!-- current xpdf version is 2.x, do not update to this -->
+<!ENTITY xpdf-version "1.01">
+<!ENTITY xpdf-package "xpdf-1.01.tar.gz">
 <!ENTITY xpdf-patch "xpdf-1.01.patch">
 
 <!ENTITY python-package "Python-2.4.6.tar.bz2">
@@ -48,6 +49,7 @@
 <!ENTITY celestia-png15-patch "celestia-1.6.0.libpng15.patch">
 
 <!-- this section is not part of the certification program yet -->
+
 <!ENTITY opensp-package "OpenSP-1.5.2.tar.gz">
 
 <!ENTITY openjade-package "openjade-1.3.2.tar.gz">
@@ -77,22 +79,23 @@
 <!ENTITY openssl-package "openssl-0.9.7m.tar.gz">
 <!ENTITY openssl-patch "openssl-0.9.7m.patch">
 
+<!-- freeglut 3.0 uses X11 features not in LSB, do not update to it -->
 <!ENTITY freeglut-package "freeglut-2.4.0.tar.gz">
 <!ENTITY freeglut-patch "freeglut-2.4.0.patch">
 
-<!ENTITY bzip2-package "bzip2-1.0.5.tar.gz">
-<!ENTITY bzip2-patch "bzip2-1.0.5.patch">
+<!ENTITY bzip2-package "bzip2-1.0.6.tar.gz">
+<!ENTITY bzip2-patch "bzip2-1.0.6.patch">
 
 <!ENTITY readline-package "readline-6.0.tar.gz">
 <!ENTITY readline-patch "readline-6.0.patch">
 
 <!ENTITY libart-lgpl-package "libart_lgpl-2.3.20.tar.bz2">
-<!-- (sb) not currently used
-<!ENTITY libart-lgpl-patch "libart_lgpl-2.3.19.patch">
--->
+<!-- (sb) not currently used -->
+<!--ENTITY libart-lgpl-patch "libart_lgpl-2.3.19.patch"-->
 
-<!ENTITY gdbm-package "gdbm-1.8.3.tar.gz">
-<!ENTITY gdbm-patch "gdbm-1.8.3.patch">
+<!ENTITY gdbm-package "gdbm-1.13.tar.gz">
+<!-- a patch not needed for this version -->
+<!--ENTITY gdbm-patch "gdbm-1.13.patch"-->
 
 <!ENTITY db-package "db-4.8.24.tar.gz">
 

=== modified file 'extras/md5sums'
--- a/extras/md5sums	2013-09-23 18:02:13 +0000
+++ b/extras/md5sums	2017-04-15 19:24:20 +0000
@@ -2,7 +2,11 @@
 0e30590f7b7f8b5ad3f7670dfa86fc25  xpaint-2.9.8.2.tar.bz2
 fc3fe1103cf9d71abe12a8c604f31c76  samba-3.5.9.tar.gz
 48fa768dd6fdeb7968041dd5ae8e2b02  groff-1.20.1.tar.gz
+f67151444bd56a7904579fc75a083dd6  ghostscript-9.02.tar.bz2
+04f8c2321a37d15f40f9ee21251c6202  alsaplayer-0.99.80.tar.bz2
 0ee8346ce16bdfe4c88a236e94c752b4  rsync-3.0.8.tar.gz
+8512d8db3233041dd68a81476906012a  tcl8.5.9-src.tar.gz
+7cdeb9feb61593f58a0ae61f2497580e  tk8.5.9-src.tar.gz
 43e1dc0e0bc9492cf2e1a6f59f276bc3  expect-5.43.0.tar.gz
 36d5b3458dfead16e3ec4df6596ec6f9  xpdf-1.01.tar.gz
 76083277f6c7e4d78992f36d7ad9018d  Python-2.4.6.tar.bz2
@@ -14,31 +18,27 @@
 411744e1ef8ce90b87938c4203f001f1  gnupg-1.4.11.tar.bz2
 992061488af7a9e2d933df6b694bb876  raptor-1.4.21.tar.gz
 8d0ff6215b2d023eaa8efef59097ef83  pidgin-2.6.3.tar.bz2
-ee98bb8f83b5f29dad7619e423966f06  leafpad-0.8.18.1.patch
-48f6d762809ad714b366d8d4fc82d5c3  scribus-1.3.3.12.tar.bz2
+254a72fc67505e3aa52884c729cd7b97  leafpad-0.8.18.1.tar.gz
+7777f2a50d6797f9757b6e078a7bea83  xscreensaver-5.14.tar.gz
+ac44511ba4c203998be3079626126ede  transmission-1.76.tar.bz2
+b2701ac4dedbb64d7762f7d31d3080f7  lyx-1.6.9.tar.bz2
 74a4d1b87e1e6e1ec95dbe58cb4c5b9a  openssl-0.9.7m.tar.gz
 6d16873bd876fbf4980a927cfbc496a1  freeglut-2.4.0.tar.gz
-3c15a0c8d1d3ee1c46a1634d00617b1a  bzip2-1.0.5.tar.gz
+00b516f4704d4a7cb50a1d97e6e8e15b  bzip2-1.0.6.tar.gz
 b7f65a48add447693be6e86f04a63019  readline-6.0.tar.gz
 d0ce67f2ebcef1e51a83136c69242a73  libart_lgpl-2.3.20.tar.bz2
-1d1b1d5c0245b1c00aff92da751e9aa1  gdbm-1.8.3.tar.gz
+8929dcda2a8de3fd2367bdbf66769376  gdbm-1.13.tar.gz
 147afdecf438ff99ade105a5272db158  db-4.8.24.tar.gz
-13f12bf58a32ebf15837fcd605cb3c99  qt-x11-opensource-src-4.2.3.tar.gz
-f67151444bd56a7904579fc75a083dd6  ghostscript-9.02.tar.bz2
-04f8c2321a37d15f40f9ee21251c6202  alsaplayer-0.99.80.tar.bz2
-7777f2a50d6797f9757b6e078a7bea83  xscreensaver-5.14.tar.gz
-b2701ac4dedbb64d7762f7d31d3080f7  lyx-1.6.9.tar.bz2
 8af94611baf20d9646c7c2c285859818  lcms-1.19.tar.gz
 79a8fbb2eed5464b97bdf94bee109380  curl-7.19.7.tar.bz2
-ac44511ba4c203998be3079626126ede  transmission-1.76.tar.bz2
 d0870f2de55d59c1c8419f36e8fac150  lua-5.1.4.tar.gz
 b43b289a859eb38a710f70622c46e571  libIDL-0.8.13.tar.bz2
 ee8b492592568805593f81f8cdf2a04c  expat-2.0.1.tar.gz
 38e58e72d476a74298a59052fde185a3  libXpm-3.5.8.tar.bz2
+0f4ac39108c1ae8c443cdfac259b58fa  libXp-1.0.0.tar.bz2
+993b3185c629e4b89401fca072dcb663  libXau-1.0.5.tar.bz2
 fc4d66be7a1a1eb474954728415e46d6  libXmu-1.0.5.tar.bz2
 815e74de989ccda684e2baf8d12cf519  libXaw-1.0.7.tar.bz2
-0f4ac39108c1ae8c443cdfac259b58fa  libXp-1.0.0.tar.bz2
-993b3185c629e4b89401fca072dcb663  libXau-1.0.5.tar.bz2
 7321847a60748b4d2f1fa16db4b6ede8  printproto-1.0.4.tar.bz2
 75c9edff1f3823e5ab6bb9e66821a901  xproto-7.0.16.tar.bz2
 5d74971360f194ce33d2bd2e4d9b066c  libX11-1.3.3.tar.bz2
@@ -46,51 +46,40 @@
 b533c0771dbbaf9b041ff35bb941d3a2  gccmakedep-1.0.2.tar.bz2
 10546b5ddda3cdda7950bb56bf98e0ea  xorg-cf-files-1.0.3.tar.bz2
 470349bfe107112cb4c36e50663b1d33  httpd-2.2.14.patch
+757dd9b80042463d853adc0bbcb200b4  httpd-2.2.0-conf.patch
 1047e17e3f8876485e679de5af700201  xpaint-2.9.8.2.patch
 65aa360ca135a55825185c1c3e94dad1  samba-3.5.9.patch
+fc0198982058294af8cd23dbcf19babc  groff-1.19.2.patch
+8e9ce57891101576e043351325f659d0  alsaplayer-0.99.80.patch
 d01d3602977ca2c8dbfcb406d9542625  rsync-3.0.8.patch
 e7d90ae68bfa83a9e65e4d4654f5f6da  tcl8.5.9.patch
-e6fa69f97241f2daff6cd4e013a2420e  tcl8.5.9-tests.patch
 2fc99a169ee0f6a493780eb14a7e5188  tcl8.5.1-expect.patch
-8512d8db3233041dd68a81476906012a  tcl8.5.9-src.tar.gz
-7cdeb9feb61593f58a0ae61f2497580e  tk8.5.9-src.tar.gz
 d272db80d95c22a7efdb1cde37e569af  tk8.5.9.patch
 31f7fd25621a4ec09235b9f6a60fd41a  expect-5.43.patch
 0e0788b560923798cab4b762a26d33b9  expect-tcl8.5.patch
+9e79c0519997283808207f9a2a3a5e6f  xpdf-1.01.patch
 2681c4b03b77bbbd35ce37639862ba45  Python-2.4.4.patch
-e567fa9005f9e8feb9e62a58390ac4c8  python-test-bug-2952.patch
+b19feace1ed591f9feff1f58baeb1788  perl-5.12.3.patch
 b2d3459d0fcdfce285ceef647540ee6d  lynx2.8.7.patch
 967ae9afe8b881d6ad6c5b404e749964  celestia-1.6.0.patch
 74fa99763b1d46aea29b4361346a33cc  celestia-1.6.0.libpng15.patch
+32b4ee1a3bcb558f8b43b76be8b6e183  gnupg-1.4.9-gcc43.patch
 d45d991da10d72e339fcec9d0a552d16  raptor-1.4.21.patch
 9f6162590ef6b9c8b543bc9c55d438fe  pidgin-2.6.3.patch
-254a72fc67505e3aa52884c729cd7b97  leafpad-0.8.18.1.tar.gz
-990c5d04bd515bd534d810a1ab9fd233  scribus-1.3.3.12.patch
+ee98bb8f83b5f29dad7619e423966f06  leafpad-0.8.18.1.patch
+78157c001ac31493b5a6b57a58749d64  xscreensaver-5.14.patch
+7f997e5c9a6ff9a6eae1ced07022bff4  transmission-1.76.patch
 0ac66bcebed1768703cae61c948a1975  openssl-0.9.7m.patch
 5610f5924a237386a2fe4864d3385e55  freeglut-2.4.0.patch
-7ee5a250c20b88f020cb35b89772aa6a  bzip2-1.0.5.patch
+c10d8798bce126285a5213c9340eef3b  bzip2-1.0.6.patch
 1a5966397118ea2932d7a773824e8ee4  readline-6.0.patch
-757dd9b80042463d853adc0bbcb200b4  httpd-2.2.0-conf.patch
-07308283b632666f12f55625da3b7ebd  gdbm-1.8.3.patch
-b19feace1ed591f9feff1f58baeb1788  perl-5.12.3.patch
-1d75ddcad4271da109d3d6981f6bd08d  0001-Temporarily-work-around-an-internal-compiler-error-i.patch
-51f26a0237f13667567d079d19b9bd7b  libart_lgpl-2.3.19.patch
-9e79c0519997283808207f9a2a3a5e6f  xpdf-1.01.patch
-a16398d70f9e14f2f3a8674b118ec538  qt-x11-opensource-src-4.2.3.patch
-ff4b68b5979e880cbb9db96b72c776ac  qt-x11-opensource-src-4.2.3-ppc64.patch
-cf7202747ebc303ab8bcb0341b1d1fa2  qt-x11-opensource-src-4.2.3-endian.patch
-8e9ce57891101576e043351325f659d0  alsaplayer-0.99.80.patch
-78157c001ac31493b5a6b57a58749d64  xscreensaver-5.14.patch
-7f997e5c9a6ff9a6eae1ced07022bff4  transmission-1.76.patch
-fc0198982058294af8cd23dbcf19babc  groff-1.19.2.patch
-32b4ee1a3bcb558f8b43b76be8b6e183  gnupg-1.4.9-gcc43.patch
+950f01d55d08e4c3a95b8260b984d46e  curl-7.19.7.patch
 66f6afbbf73781258f827b3fa8834697  lua-5.1.4.patch
-950f01d55d08e4c3a95b8260b984d46e  curl-7.19.7.patch
+d4a2abfc94282109b220dea11e8315ba  libXp-1.0.0.patch
+5e6e0d07a20ff76e34f9753fe9a36ecd  libXau-1.0.5.patch
 14fcc3b2b0395508ea92ea0e71270da9  libXmu-1.0.5.patch
-5e6e0d07a20ff76e34f9753fe9a36ecd  libXau-1.0.5.patch
-d4a2abfc94282109b220dea11e8315ba  libXp-1.0.0.patch
+6a9138a1c1d6aa98670016d3bc94cf3d  libXaw-1.0.7.patch
 deb216053844465854fa2e9305c3574f  xorg-cf-files-1.0.3.patch
-6a9138a1c1d6aa98670016d3bc94cf3d  libXaw-1.0.7.patch
 660f8bb4e0e2e184b728f7fc48bf38df  alsaplayer-0.99.80.lsb5.patch
 65e818d5a8a760a0b7342be8ff86843d  gnupg-1.4.9.lsb5.patch
 6485c47efe37075e99d94ae821a5af44  leafpad-0.8.18.1.lsb5.patch

=== modified file 'extras/package_locations'
--- a/extras/package_locations	2016-12-29 18:40:49 +0000
+++ b/extras/package_locations	2017-04-15 19:24:20 +0000
@@ -34,7 +34,7 @@
 openssl http://www.openssl.org/source none
 freeglut http://prdownloads.sourceforge.net/freeglut none
 tiff ftp://ftp.remotesensing.org/pub/libtiff none
-bzip2 http://www.bzip.org/1.0.5 none
+bzip2 http://www.bzip.org/1.0.6 none
 readline http://ftp.gnu.org/pub/gnu/readline none
 libart-lgpl http://ftp.gnome.org/pub/GNOME/platform/2.22/2.22.0/sources None
 gdbm http://ftp.gnu.org/pub/gnu/gdbm none

=== modified file 'rpm/lsb-build-libbat.spec'
--- a/rpm/lsb-build-libbat.spec	2017-04-14 15:44:31 +0000
+++ b/rpm/lsb-build-libbat.spec	2017-04-15 19:24:20 +0000
@@ -2,8 +2,8 @@
 
 Summary: LSB Library Battery
 Name: lsb-build-libbat-%{appbatversion}
-Version: 1.1
-Release: 3.lsb5
+Version: 1.2
+Release: 1.lsb5
 Vendor: Linux Foundation
 Packager: LSB project team <lsb-discuss at linuxfoundation.org>
 License: Open Source Compatible
@@ -14,7 +14,7 @@
 Conflicts: lsb-build-libbat
 BuildRequires: lsb-build-cc lsb-build-desktop
 
-# tarball versions
+# tarball versions. these should stay in sync with entities/package.
 %define xproto_ver 7.0.16
 %define libx11_ver 1.3.3
 %define libxau_ver 1.0.5
@@ -29,17 +29,17 @@
 %define libxaw_ver 1.0.7
 %define freeglut_ver 2.4.0
 %define openssl_ver 0.9.7m
-%define bzip2_ver 1.0.5
+%define bzip2_ver 1.0.6
 %define readline_ver 6.0 
 %define libart_lgpl_ver 2.3.20
-%define gdbm_ver 1.8.3
+%define gdbm_ver 1.13
 %define db_ver 4.8.24
 %define lcms_ver 1.19
 %define curl_ver 7.19.7
 %define lua_ver 5.1.4
 %define libidl_ver 0.8.13
 
-# sources
+# sources. these are not actually used, entitychecker fetches pkgs.
 Source0: http://ftp.x.org/pub/individual/proto/xproto-%{xproto_ver}.tar.bz2
 Source1: http://ftp.x.org/pub/individual/lib/libX11-%{libx11_ver}.tar.bz2
 Source2: http://ftp.x.org/pub/individual/lib/libXau-%{libxau_ver}.tar.bz2
@@ -54,7 +54,7 @@
 Source11: http://ftp.x.org/pub/individual/lib/libXaw-%{libxaw_ver}.tar.bz2
 Source13: http://easynews.dl.sourceforge.net/sourceforge/freeglut/freeglut-%{freeglut_ver}.tar.gz
 Source14: http://www.openssl.org/source/openssl-%{openssl_ver}.tar.gz
-Source15: http://www.bzip.org/1.0.5/bzip2-%{bzip2_ver}.tar.gz
+Source15: http://www.bzip.org/1.0.6/bzip2-%{bzip2_ver}.tar.gz
 Source16: ftp://ftp.gnu.org/gnu/readline/readline-%{readline_ver}.tar.gz
 Source17: ftp://ftp.gnome.org/pub/GNOME/platform/2.22/2.22.0/sources/libart_lgpl-%{libart_lgpl_ver}.tar.bz2
 Source18: http://ftp.gnu.org/pub/gnu/gdbm/gdbm-%{gdbm_ver}.tar.gz
@@ -74,16 +74,16 @@
 Patch14: openssl-%{openssl_ver}.patch
 Patch15: bzip2-%{bzip2_ver}.patch
 Patch16: readline-%{readline_ver}.patch
-Patch18: gdbm-%{gdbm_ver}.patch
+#Patch18: gdbm-%{gdbm_ver}.patch
 Patch21: curl-%{curl_ver}.patch
 Patch22: lua-%{lua_ver}.patch
 
 %description
-LSB conforming static libraries and headers from selected packages
-to enable more portable building.  Includes openssl.
+LSB conforming build static libraries and headers from selected 
+packages to enable more portable building.  Includes openssl.
 The collection is released under the Open Source license,
 however the respective libraries remain under the license
-they are issued under by the maintainers.
+they are issued under by their maintainers.
 
 %prep
 # Bail early on some known buildrequires that we can't specify as packages
@@ -124,9 +124,9 @@
 %patch16 -p0 -b .lsbcc
 
 # gdbm
-cd gdbm-%{gdbm_ver}
-%patch18 -p0 -b .lsbcc
-cd ..
+#cd gdbm-%{gdbm_ver}
+#%patch18 -p0 -b .lsbcc
+#cd ..
 
 # curl
 %patch21 -p0 -b .lsbcc
@@ -134,10 +134,6 @@
 # lua
 %patch22 -p0 -b .lsbcc
 
-%description
-LSB conforming static libraries and headers from selected packages
-to enable more portable building.  Includes openssl.
-
 %build
 # We install twice; once during build, for dependent bits, and once
 # during the install phase, for real.  This is left over from when all
@@ -457,11 +453,12 @@
 # gdbm
 cd gdbm-%{gdbm_ver}
 ./configure \
+	--enable-libgdbm-compat \
 	--prefix=%{prefix} \
 	--libdir=%{libdir} \
 	--disable-shared \
 	--with-pic
-make INSTALL_ROOT=%{buildroot} all
+make all
 cd ..
 
 # ----------------------------------------------------
@@ -683,7 +680,7 @@
 # (probably already there from previous builds)
 install -d %{buildroot}%{libdir}
 
-make INSTALL_ROOT=%{buildroot} install install-compat
+make DESTDIR=%{buildroot} install
 
 # create this file
 echo "GROUP ( %{libdir}/libgdbm.a %{libdir}/libgdbm_compat.a )" >  %{buildroot}%{libdir}/libndbm.a
@@ -1019,6 +1016,10 @@
 %{mandir}/man1/gccmakedep.1x
 
 %changelog
+* Sat Apr 15 2017 Mats Wichmann <mats at linuxfoundation.org>
+- uplift gdbm to silent lots of modern-compiler warnings
+- uplift bzip2 just because
+
 * Mon Oct 08 2012 Stew Benedict <stewb at linux-foundation.org>
 - remove libtiff (part of LSB 5.0 now)
 



More information about the lsb-messages mailing list