[Lsb-messages] /var/www/bzr/lsb/devel/appbat r971: Remove libtiff from libbat (part of LSB 5.0 now)
Stew Benedict
stewb at linux-foundation.org
Mon Oct 8 12:59:29 UTC 2012
------------------------------------------------------------
revno: 971
committer: Stew Benedict <stewb at linux-foundation.org>
branch nick: appbat
timestamp: Mon 2012-10-08 08:59:29 -0400
message:
Remove libtiff from libbat (part of LSB 5.0 now)
modified:
entities/package
entities/system
extras/md5sums
rpm/lsb-build-libbat.spec.in
-------------- next part --------------
=== modified file 'entities/package'
--- a/entities/package 2012-05-10 16:06:50 +0000
+++ b/entities/package 2012-10-08 12:59:29 +0000
@@ -79,9 +79,6 @@
<!ENTITY freeglut-package "freeglut-2.4.0.tar.gz">
<!ENTITY freeglut-patch "freeglut-2.4.0.patch">
-<!ENTITY tiff-package "tiff-3.9.2.tar.gz">
-<!ENTITY tiff-patch "tiff-3.9.2.patch">
-
<!ENTITY bzip2-package "bzip2-1.0.5.tar.gz">
<!ENTITY bzip2-patch "bzip2-1.0.5.patch">
=== modified file 'entities/system'
--- a/entities/system 2011-02-18 23:08:45 +0000
+++ b/entities/system 2012-10-08 12:59:29 +0000
@@ -66,9 +66,6 @@
<!ENTITY libs-openssl SYSTEM "libs/openssl.xml">
<!ENTITY libs-freeglut SYSTEM "libs/freeglut.xml">
<!ENTITY libs-freetype SYSTEM "libs/freetype.xml">
-<!ENTITY libs-jpeg SYSTEM "libs/jpeg.xml">
-<!ENTITY libs-tiff SYSTEM "libs/tiff.xml">
-<!ENTITY libs-png SYSTEM "libs/png.xml">
<!ENTITY libs-gdbm SYSTEM "libs/gdbm.xml">
<!ENTITY libs-db SYSTEM "libs/db.xml">
<!ENTITY libs-lcms SYSTEM "libs/lcms.xml">
=== modified file 'extras/md5sums'
--- a/extras/md5sums 2012-06-11 12:34:34 +0000
+++ b/extras/md5sums 2012-10-08 12:59:29 +0000
@@ -18,7 +18,6 @@
48f6d762809ad714b366d8d4fc82d5c3 scribus-1.3.3.12.tar.bz2
74a4d1b87e1e6e1ec95dbe58cb4c5b9a openssl-0.9.7m.tar.gz
6d16873bd876fbf4980a927cfbc496a1 freeglut-2.4.0.tar.gz
-93e56e421679c591de7552db13384cb8 tiff-3.9.2.tar.gz
3c15a0c8d1d3ee1c46a1634d00617b1a bzip2-1.0.5.tar.gz
b7f65a48add447693be6e86f04a63019 readline-6.0.tar.gz
d0ce67f2ebcef1e51a83136c69242a73 libart_lgpl-2.3.20.tar.bz2
@@ -68,9 +67,6 @@
990c5d04bd515bd534d810a1ab9fd233 scribus-1.3.3.12.patch
0ac66bcebed1768703cae61c948a1975 openssl-0.9.7m.patch
5610f5924a237386a2fe4864d3385e55 freeglut-2.4.0.patch
-095c4625c578cbbc7f830cefdfc60261 jpeg-6b.patch
-7eb4cc0531fe8346511a385eb4749051 tiff-3.9.2.patch
-307e698d6b74ce1562b6745d169bf6eb libpng-1.2.18.patch
7ee5a250c20b88f020cb35b89772aa6a bzip2-1.0.5.patch
1a5966397118ea2932d7a773824e8ee4 readline-6.0.patch
757dd9b80042463d853adc0bbcb200b4 httpd-2.2.0-conf.patch
=== modified file 'rpm/lsb-build-libbat.spec.in'
--- a/rpm/lsb-build-libbat.spec.in 2012-06-08 20:20:19 +0000
+++ b/rpm/lsb-build-libbat.spec.in 2012-10-08 12:59:29 +0000
@@ -1,6 +1,6 @@
Summary: LSB Library Battery
Name: lsb-build-libbat- at APPBATVERSION@
-Version: 1.0
+Version: 1.1
Release: 1
Vendor: Linux Foundation
Packager: Appbat Team <lsb-appbat at linux-foundation.org>
@@ -25,7 +25,6 @@
%define gccmakedep_ver 1.0.2
%define xorgcf_ver 1.0.3
%define libxaw_ver 1.0.7
-%define tiff_ver 3.9.2
%define freeglut_ver 2.4.0
%define openssl_ver 0.9.7m
%define bzip2_ver 1.0.5
@@ -51,7 +50,6 @@
Source9: http://ftp.x.org/pub/individual/util/gccmakedep-%{gccmakedep_ver}.tar.bz2
Source10: http://ftp.x.org/pub/individual/util/xorg-cf-files-%{xorgcf_ver}.tar.bz2
Source11: http://ftp.x.org/pub/individual/lib/libXaw-%{libxaw_ver}.tar.bz2
-Source12: ftp://ftp.remotesensing.org/pub/tiff-%{tiff_ver}.tar.gz
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
@@ -70,7 +68,6 @@
Patch7: libXp-%{libxp_ver}.patch
Patch10: xorg-cf-files-%{xorgcf_ver}.patch
Patch11: libXaw-%{libxaw_ver}.patch
-Patch12: tiff-%{tiff_ver}.patch
Patch13: freeglut-%{freeglut_ver}.patch
Patch14: openssl-%{openssl_ver}.patch
Patch15: bzip2-%{bzip2_ver}.patch
@@ -93,7 +90,7 @@
done
# all the tarballs
-%setup -q -c -a0 -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a12 -a13 -a14 -a15 -a16 -a17 -a18 -a19 -a20 -a21 -a22 -a23
+%setup -q -c -a0 -a1 -a2 -a3 -a4 -a5 -a6 -a7 -a8 -a9 -a10 -a11 -a13 -a14 -a15 -a16 -a17 -a18 -a19 -a20 -a21 -a22 -a23
# patch the ones that need it
@@ -112,9 +109,6 @@
# libXaw
%patch11 -p0 -b .lsbcc
-# tiff
-%patch12 -p0 -b .lsbcc
-
# freeglut
%patch13 -p0 -b .lsbcc
@@ -380,22 +374,6 @@
cd ..
# ----------------------------------------------------
-# libtiff
-cd tiff-%{tiff_ver}
-./configure \
- --prefix=%{prefix} \
- --libdir=%{libdir} \
- --with-jpeg-lib-dir=%{libdir} \
- --with-jpeg-include-dir=%{includedir} \
- --disable-cxx \
- --disable-shared \
- --with-pic
-
-make
-make DESTDIR=%{buildroot} install
-cd ..
-
-# ----------------------------------------------------
# freeglut
cd freeglut-%{freeglut_ver}
./configure \
@@ -546,7 +524,7 @@
--enable-static
# was failing on s390x trying to build commands we don't need
-sed -i 's|SUBDIRS = src jpegicc tifficc python samples testbed include|SUBDIRS = src include|g' Makefile
+sed -i 's|SUBDIRS = src jpegicc python samples testbed include|SUBDIRS = src include|g' Makefile
make
make DESTDIR=%{buildroot} install
@@ -654,13 +632,6 @@
%{libdir}/libglut.a
%{libdir}/libglut.la
%{includedir}/GL
-### tiff set
-%{includedir}/tiff.h
-%{includedir}/tiffconf.h
-%{includedir}/tiffio.h
-%{includedir}/tiffvers.h
-%{libdir}/libtiff.a
-%{libdir}/libtiff.la
### bzip2 set
%{includedir}/bzlib.h
%{libdir}/libbz2.a
@@ -886,6 +857,9 @@
%{mandir}/man1/gccmakedep.1x
%changelog
+* Mon Oct 08 2012 Stew Benedict <stewb at linux-foundation.org>
+- remove libtiff (part of LSB 5.0 now)
+
* Fri Jun 08 2012 Stew Benedict <stewb at linux-foundation.org>
- re-organize libbat into it's own version-specific namespace (bug 3586)
More information about the lsb-messages
mailing list