corporate2/devel/system/base/zlib - Merge from 2011/devel/system/base/zlib/
Ozan Çağlayan
paketler-commits at pardus.org.tr
Mon Sep 27 11:39:36 EEST 2010
Author: ozan.caglayan
Date: Mon Sep 27 11:39:36 2010
New Revision: 101158
Added:
corporate2/devel/system/base/zlib/files/dont-call-ldconfig.patch
- copied unchanged from r101157, 2011/devel/system/base/zlib/files/dont-call-ldconfig.patch
corporate2/devel/system/base/zlib/files/zlib-1.2.4-autotools.patch
- copied unchanged from r101157, 2011/devel/system/base/zlib/files/zlib-1.2.4-autotools.patch
corporate2/devel/system/base/zlib/files/zlib-1.2.5-gentoo.patch
- copied unchanged from r101157, 2011/devel/system/base/zlib/files/zlib-1.2.5-gentoo.patch
Removed:
corporate2/devel/system/base/zlib/files/minizip-1.2.3-malloc.patch
corporate2/devel/system/base/zlib/files/zlib-1.2.1-CAN-2004-0797.patch
corporate2/devel/system/base/zlib/files/zlib-1.2.1-build-fPIC.patch
corporate2/devel/system/base/zlib/files/zlib-1.2.1-configure.patch
corporate2/devel/system/base/zlib/files/zlib-1.2.1-fPIC.patch
corporate2/devel/system/base/zlib/files/zlib-1.2.1-glibc.patch
corporate2/devel/system/base/zlib/files/zlib-1.2.1-make-test.patch
corporate2/devel/system/base/zlib/files/zlib-1.2.1-mapfile.patch
corporate2/devel/system/base/zlib/files/zlib-1.2.1-vsnprintf.patch
corporate2/devel/system/base/zlib/files/zlib-1.2.3-LDFLAGS.patch
corporate2/devel/system/base/zlib/files/zlib-1.2.3-visibility-support.patch
Modified:
corporate2/devel/system/base/zlib/ (props changed)
corporate2/devel/system/base/zlib/actions.py
corporate2/devel/system/base/zlib/files/zlib-1.2.2-format.patch
corporate2/devel/system/base/zlib/pspec.xml
corporate2/devel/system/base/zlib/translations.xml
Log:
Merge from 2011/devel/system/base/zlib/:
rev. 93813, by ozan.caglayan on 2010-06-08
Merge from corporate2/devel/system/base/zlib:
rev. 93798, by ozan.caglayan on 2010-06-08
Merge from 2009
rev. 97862, by ozan.caglayan on 2010-08-20
Version bump and split devel packages.
---
actions.py | 25 +++++--
files/dont-call-ldconfig.patch | 12 +++
files/minizip-1.2.3-malloc.patch | 15 ----
files/zlib-1.2.1-CAN-2004-0797.patch | 28 --------
files/zlib-1.2.1-build-fPIC.patch | 65 ------------------
files/zlib-1.2.1-configure.patch | 103 ------------------------------
files/zlib-1.2.1-fPIC.patch | 15 ----
files/zlib-1.2.1-glibc.patch | 12 ---
files/zlib-1.2.1-make-test.patch | 23 ------
files/zlib-1.2.1-mapfile.patch | 88 -------------------------
files/zlib-1.2.1-vsnprintf.patch | 42 ------------
files/zlib-1.2.2-format.patch | 20 +++--
files/zlib-1.2.3-LDFLAGS.patch | 31 ---------
files/zlib-1.2.3-visibility-support.patch | 45 -------------
files/zlib-1.2.4-autotools.patch | 68 +++++++++++++++++++
files/zlib-1.2.5-gentoo.patch | 12 +++
pspec.xml | 54 ++++++++++++---
translations.xml | 10 ++
18 files changed, 174 insertions(+), 494 deletions(-)
Modified: corporate2/devel/system/base/zlib/actions.py
=================================================================
--- corporate2/devel/system/base/zlib/actions.py (original)
+++ corporate2/devel/system/base/zlib/actions.py Mon Sep 27 11:39:36 2010
@@ -12,18 +12,31 @@
def setup():
shelltools.makedirs("m4")
- autotools.autoreconf("-fi")
+ shelltools.makedirs("contrib/minizip/m4")
- autotools.configure("--disable-static")
+ shelltools.copy("minigzip.c", "contrib/minizip")
+ autotools.rawConfigure("--libdir=/usr/lib \
+ --includedir=/usr/include \
+ --prefix=/usr")
def build():
autotools.make()
+ shelltools.cd("contrib/minizip")
+ autotools.autoreconf("-vi")
+
+ autotools.configure()
+ autotools.make()
+
+def check():
+ autotools.make("test")
+
def install():
- autotools.install()
+ autotools.rawInstall("DESTDIR=%s" % get.installDIR())
# Copy zlib to /lib
+ pisitools.remove("/usr/lib/*.a")
pisitools.domove("/usr/lib/libz*", "/lib")
# Create symlinks in /usr/lib
@@ -31,9 +44,9 @@
pisitools.dosym("libz.so.%s" % get.srcVERSION(), "/usr/lib/libz.so.1")
pisitools.dosym("libz.so.1", "/usr/lib/libz.so")
- for header in ["zconf.h","zlib.h","zutil.h"]:
- pisitools.insinto("/usr/include", header)
+ # Install minizip
+ autotools.rawInstall("-C contrib/minizip DESTDIR=%s" % get.installDIR())
pisitools.doman("zlib.3")
- pisitools.dodoc("FAQ", "README", "ChangeLog", "algorithm.txt")
+ pisitools.dodoc("FAQ", "README", "ChangeLog", "doc/algorithm.txt", "example.c")
Modified: corporate2/devel/system/base/zlib/files/zlib-1.2.2-format.patch
=================================================================
--- corporate2/devel/system/base/zlib/files/zlib-1.2.2-format.patch (original)
+++ corporate2/devel/system/base/zlib/files/zlib-1.2.2-format.patch Mon Sep 27 11:39:36 2010
@@ -1,16 +1,18 @@
---- zlib-1.2.2/zlib.h.xx 2005-02-23 12:52:02.889385975 +0100
-+++ zlib-1.2.2/zlib.h 2005-02-23 12:55:14.227599948 +0100
-@@ -986,7 +986,12 @@
- (0 in case of error).
+Index: zlib-1.2.5/zlib.h
+===================================================================
+--- zlib-1.2.5.orig/zlib.h
++++ zlib-1.2.5/zlib.h
+@@ -1256,7 +1256,12 @@ ZEXTERN int ZEXPORT gzwrite OF((gzFile f
+ error.
*/
--ZEXTERN int ZEXPORTVA gzprintf OF((gzFile file, const char *format, ...));
-+
-+ZEXTERN int ZEXPORTVA gzprintf OF((gzFile file, const char *format, ...))
+-ZEXTERN int ZEXPORTVA gzprintf OF((gzFile file, const char *format, ...));
++ZEXTERN int ZEXPORTVA gzprintf OF((gzFile file, const char *format, ...))
+#ifdef __GNUC__
+ __attribute__((__format__(__printf__,2,3)))
+#endif
+;
++
/*
- Converts, formats, and writes the args to the compressed file under
- control of the format string, as in fprintf. gzprintf returns the number of
+ Converts, formats, and writes the arguments to the compressed file under
+ control of the format string, as in fprintf. gzprintf returns the number of
Modified: corporate2/devel/system/base/zlib/pspec.xml
=================================================================
--- corporate2/devel/system/base/zlib/pspec.xml (original)
+++ corporate2/devel/system/base/zlib/pspec.xml Mon Sep 27 11:39:36 2010
@@ -11,19 +11,12 @@
<License>ZLIB</License>
<IsA>library</IsA>
<Summary>Standard (de)compression library</Summary>
- <Archive sha1sum="60faeaaf250642db5c0ea36cd6dcc9f99c8f3902" type="targz">http://www.zlib.net/zlib-1.2.3.tar.gz</Archive>
+ <Archive sha1sum="8e8b93fa5eb80df1afe5422309dca42964562d7e" type="targz">http://www.zlib.net/zlib-1.2.5.tar.gz</Archive>
<Patches>
- <Patch level="1">zlib-1.2.3-autotools.patch</Patch>
- <Patch level="1">minizip-1.2.3-malloc.patch</Patch>
- <Patch level="1">zlib-1.2.3-visibility-support.patch</Patch>
- <Patch level="1">zlib-1.2.1-glibc.patch</Patch>
- <Patch level="1">zlib-1.2.1-build-fPIC.patch</Patch>
- <Patch>zlib-1.2.1-configure.patch</Patch>
- <Patch level="1">zlib-1.2.1-fPIC.patch</Patch>
- <Patch level="1">zlib-1.2.1-make-test.patch</Patch>
- <Patch>zlib-1.2.1-vsnprintf.patch</Patch>
+ <Patch level="1">zlib-1.2.4-autotools.patch</Patch>
+ <Patch level="1">zlib-1.2.5-gentoo.patch</Patch>
+ <Patch level="1">dont-call-ldconfig.patch</Patch>
<Patch level="1">zlib-1.2.2-format.patch</Patch>
- <Patch level="1">zlib-1.2.3-LDFLAGS.patch</Patch>
</Patches>
</Source>
@@ -31,8 +24,23 @@
<Name>minizip</Name>
<PartOf>util.archive</PartOf>
<Summary>Library for manipulating files from a zip archive</Summary>
+ <RuntimeDependencies>
+ <Dependency release="10">zlib</Dependency>
+ </RuntimeDependencies>
<Files>
<Path fileType="library">/usr/lib/libminizip.so*</Path>
+ </Files>
+ </Package>
+
+ <Package>
+ <Name>minizip-devel</Name>
+ <PartOf>util.archive</PartOf>
+ <Summary>Development files for minizip</Summary>
+ <RuntimeDependencies>
+ <Dependency release="10">minizip</Dependency>
+ <Dependency release="10">zlib-devel</Dependency>
+ </RuntimeDependencies>
+ <Files>
<Path fileType="header">/usr/include/minizip</Path>
<Path fileType="data">/usr/lib/pkgconfig/minizip.pc</Path>
</Files>
@@ -45,11 +53,33 @@
<Path fileType="library">/usr/lib/libz.so*</Path>
<Path fileType="doc">/usr/share/doc</Path>
<Path fileType="man">/usr/share/man</Path>
- <Path fileType="header">/usr/include</Path>
+ </Files>
+ </Package>
+
+ <Package>
+ <Name>zlib-devel</Name>
+ <PartOf>system.devel</PartOf>
+ <Summary>Development files for zlib</Summary>
+ <RuntimeDependencies>
+ <Dependency release="10">zlib</Dependency>
+ </RuntimeDependencies>
+ <Files>
+ <Path fileType="data">/usr/lib/pkgconfig/zlib.pc</Path>
+ <Path fileType="header">/usr/include/z*.h</Path>
+ <Path fileType="man">/usr/share/man/man3</Path>
+ <Path fileType="doc">/usr/share/doc/zlib/algorithm.txt</Path>
+ <Path fileType="doc">/usr/share/doc/zlib/example.c</Path>
</Files>
</Package>
<History>
+ <Update release="10">
+ <Date>2010-08-20</Date>
+ <Version>1.2.5</Version>
+ <Comment>Version bump and split devel packages.</Comment>
+ <Name>Ozan Çağlayan</Name>
+ <Email>ozan at pardus.org.tr</Email>
+ </Update>
<Update release="9">
<Date>2010-06-08</Date>
<Version>1.2.3</Version>
Modified: corporate2/devel/system/base/zlib/translations.xml
=================================================================
--- corporate2/devel/system/base/zlib/translations.xml (original)
+++ corporate2/devel/system/base/zlib/translations.xml Mon Sep 27 11:39:36 2010
@@ -10,4 +10,14 @@
<Name>minizip</Name>
<Summary xml:lang="tr">zip arşivlerindeki dosyaları yönetmek için kitaplık</Summary>
</Package>
+
+ <Package>
+ <Name>minizip-devel</Name>
+ <Summary xml:lang="tr">minizip için geliştirme dosyaları</Summary>
+ </Package>
+
+ <Package>
+ <Name>zlib-devel</Name>
+ <Summary xml:lang="tr">zlib için geliştirme dosyaları</Summary>
+ </Package>
</PISI>
More information about the paketler-commits
mailing list