Page Menu
Home
Solus
Search
Configure Global Search
Log In
Files
F10832182
D783.id1714.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
11 KB
Referenced Files
None
Subscribers
None
D783.id1714.diff
View Options
diff --git a/abi_symbols b/abi_symbols
--- a/abi_symbols
+++ b/abi_symbols
@@ -1,3 +1,68 @@
+libminizip.so.1:LoadCentralDirectoryRecord
+libminizip.so.1:Write_EndOfCentralDirectoryRecord
+libminizip.so.1:Write_GlobalComment
+libminizip.so.1:Write_LocalFileHeader
+libminizip.so.1:Write_Zip64EndOfCentralDirectoryLocator
+libminizip.so.1:Write_Zip64EndOfCentralDirectoryRecord
+libminizip.so.1:call_zopen64
+libminizip.so.1:call_zseek64
+libminizip.so.1:call_ztell64
+libminizip.so.1:fill_fopen64_filefunc
+libminizip.so.1:fill_fopen_filefunc
+libminizip.so.1:fill_zlib_filefunc64_32_def_from_filefunc32
+libminizip.so.1:unzClose
+libminizip.so.1:unzCloseCurrentFile
+libminizip.so.1:unzGetCurrentFileInfo
+libminizip.so.1:unzGetCurrentFileInfo64
+libminizip.so.1:unzGetCurrentFileZStreamPos64
+libminizip.so.1:unzGetFilePos
+libminizip.so.1:unzGetFilePos64
+libminizip.so.1:unzGetGlobalComment
+libminizip.so.1:unzGetGlobalInfo
+libminizip.so.1:unzGetGlobalInfo64
+libminizip.so.1:unzGetLocalExtrafield
+libminizip.so.1:unzGetOffset
+libminizip.so.1:unzGetOffset64
+libminizip.so.1:unzGoToFilePos
+libminizip.so.1:unzGoToFilePos64
+libminizip.so.1:unzGoToFirstFile
+libminizip.so.1:unzGoToNextFile
+libminizip.so.1:unzLocateFile
+libminizip.so.1:unzOpen
+libminizip.so.1:unzOpen2
+libminizip.so.1:unzOpen2_64
+libminizip.so.1:unzOpen64
+libminizip.so.1:unzOpenCurrentFile
+libminizip.so.1:unzOpenCurrentFile2
+libminizip.so.1:unzOpenCurrentFile3
+libminizip.so.1:unzOpenCurrentFilePassword
+libminizip.so.1:unzReadCurrentFile
+libminizip.so.1:unzRepair
+libminizip.so.1:unzSetOffset
+libminizip.so.1:unzSetOffset64
+libminizip.so.1:unzStringFileNameCompare
+libminizip.so.1:unzeof
+libminizip.so.1:unztell
+libminizip.so.1:unztell64
+libminizip.so.1:zipClose
+libminizip.so.1:zipCloseFileInZip
+libminizip.so.1:zipCloseFileInZipRaw
+libminizip.so.1:zipCloseFileInZipRaw64
+libminizip.so.1:zipOpen
+libminizip.so.1:zipOpen2
+libminizip.so.1:zipOpen2_64
+libminizip.so.1:zipOpen3
+libminizip.so.1:zipOpen64
+libminizip.so.1:zipOpenNewFileInZip
+libminizip.so.1:zipOpenNewFileInZip2
+libminizip.so.1:zipOpenNewFileInZip2_64
+libminizip.so.1:zipOpenNewFileInZip3
+libminizip.so.1:zipOpenNewFileInZip3_64
+libminizip.so.1:zipOpenNewFileInZip4
+libminizip.so.1:zipOpenNewFileInZip4_64
+libminizip.so.1:zipOpenNewFileInZip64
+libminizip.so.1:zipRemoveExtraInfoBlock
+libminizip.so.1:zipWriteInFileInZip
libz.so.1:ZLIB_1.2.0
libz.so.1:ZLIB_1.2.0.2
libz.so.1:ZLIB_1.2.0.8
diff --git a/abi_symbols32 b/abi_symbols32
--- a/abi_symbols32
+++ b/abi_symbols32
@@ -1,3 +1,68 @@
+libminizip.so.1:LoadCentralDirectoryRecord
+libminizip.so.1:Write_EndOfCentralDirectoryRecord
+libminizip.so.1:Write_GlobalComment
+libminizip.so.1:Write_LocalFileHeader
+libminizip.so.1:Write_Zip64EndOfCentralDirectoryLocator
+libminizip.so.1:Write_Zip64EndOfCentralDirectoryRecord
+libminizip.so.1:call_zopen64
+libminizip.so.1:call_zseek64
+libminizip.so.1:call_ztell64
+libminizip.so.1:fill_fopen64_filefunc
+libminizip.so.1:fill_fopen_filefunc
+libminizip.so.1:fill_zlib_filefunc64_32_def_from_filefunc32
+libminizip.so.1:unzClose
+libminizip.so.1:unzCloseCurrentFile
+libminizip.so.1:unzGetCurrentFileInfo
+libminizip.so.1:unzGetCurrentFileInfo64
+libminizip.so.1:unzGetCurrentFileZStreamPos64
+libminizip.so.1:unzGetFilePos
+libminizip.so.1:unzGetFilePos64
+libminizip.so.1:unzGetGlobalComment
+libminizip.so.1:unzGetGlobalInfo
+libminizip.so.1:unzGetGlobalInfo64
+libminizip.so.1:unzGetLocalExtrafield
+libminizip.so.1:unzGetOffset
+libminizip.so.1:unzGetOffset64
+libminizip.so.1:unzGoToFilePos
+libminizip.so.1:unzGoToFilePos64
+libminizip.so.1:unzGoToFirstFile
+libminizip.so.1:unzGoToNextFile
+libminizip.so.1:unzLocateFile
+libminizip.so.1:unzOpen
+libminizip.so.1:unzOpen2
+libminizip.so.1:unzOpen2_64
+libminizip.so.1:unzOpen64
+libminizip.so.1:unzOpenCurrentFile
+libminizip.so.1:unzOpenCurrentFile2
+libminizip.so.1:unzOpenCurrentFile3
+libminizip.so.1:unzOpenCurrentFilePassword
+libminizip.so.1:unzReadCurrentFile
+libminizip.so.1:unzRepair
+libminizip.so.1:unzSetOffset
+libminizip.so.1:unzSetOffset64
+libminizip.so.1:unzStringFileNameCompare
+libminizip.so.1:unzeof
+libminizip.so.1:unztell
+libminizip.so.1:unztell64
+libminizip.so.1:zipClose
+libminizip.so.1:zipCloseFileInZip
+libminizip.so.1:zipCloseFileInZipRaw
+libminizip.so.1:zipCloseFileInZipRaw64
+libminizip.so.1:zipOpen
+libminizip.so.1:zipOpen2
+libminizip.so.1:zipOpen2_64
+libminizip.so.1:zipOpen3
+libminizip.so.1:zipOpen64
+libminizip.so.1:zipOpenNewFileInZip
+libminizip.so.1:zipOpenNewFileInZip2
+libminizip.so.1:zipOpenNewFileInZip2_64
+libminizip.so.1:zipOpenNewFileInZip3
+libminizip.so.1:zipOpenNewFileInZip3_64
+libminizip.so.1:zipOpenNewFileInZip4
+libminizip.so.1:zipOpenNewFileInZip4_64
+libminizip.so.1:zipOpenNewFileInZip64
+libminizip.so.1:zipRemoveExtraInfoBlock
+libminizip.so.1:zipWriteInFileInZip
libz.so.1:ZLIB_1.2.0
libz.so.1:ZLIB_1.2.0.2
libz.so.1:ZLIB_1.2.0.8
diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,21 +1,47 @@
name : zlib
version : 1.2.11
-release : 14
+release : 15
source :
- http://zlib.net/zlib-1.2.11.tar.gz : c3e5e9fdd5004dcb542feda5ee4f0ff0744628baf8ed2dd5d66f8ca1197cb1a1
homepage : http://www.zlib.net
license : ZLIB
component : system.base
-summary : zlib (Compression library)
-description: |
- The zlib library is a compression library that aims to be unobtrusive.
+summary :
+ - zlib (Compression library)
+ - minizip: Mini zip and unzip based on zlib
+ - minizip-32bit: Mini zip and unzip based on zlib
+description:
+ - The zlib library is a compression library that aims to be unobtrusive.
+ - minizip: Mini zip and unzip based on zlib
+ - minizip-32bit: Mini zip and unzip based on zlib
devel : yes
emul32 : yes
+patterns :
+ - minizip:
+ - /usr/include/minizip/*
+ - /usr/lib64/libminizip.*
+ - /usr/lib64/pkgconfig/minizip.pc
+ - minizip-32bit:
+ - /usr/lib32/libminizip.*
+ - /usr/lib32/pkgconfig/minizip.pc
setup : |
%patch -p1 < $pkgfiles/no_ldconfig.patch
./configure --prefix=/usr \
--libdir=%libdir%
+
+ # configure minizip
+ pushd contrib/minizip
+ %reconfigure
+ popd
build : |
%make
+ # build minizip
+ pushd contrib/minizip
+ %make
+ popd
install : |
%make_install
+ # install minizip
+ pushd contrib/minizip
+ %make_install
+ popd
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -3,21 +3,19 @@
<Name>zlib</Name>
<Homepage>http://www.zlib.net</Homepage>
<Packager>
- <Name>Peter O'Connor</Name>
- <Email>peter@solus-project.com</Email>
+ <Name>Matthias Eliasson</Name>
+ <Email>matthias.eliasson@gmail.com</Email>
</Packager>
<License>ZLIB</License>
<PartOf>system.base</PartOf>
<Summary xml:lang="en">zlib (Compression library)</Summary>
- <Description xml:lang="en">The zlib library is a compression library that aims to be unobtrusive.
-</Description>
+ <Description xml:lang="en">The zlib library is a compression library that aims to be unobtrusive.</Description>
<Archive type="binary" sha1sum="79eb0752a961b8e0d15c77d298c97498fbc89c5a">https://solus-project.com/sources/README.Solus</Archive>
</Source>
<Package>
<Name>zlib</Name>
<Summary xml:lang="en">zlib (Compression library)</Summary>
- <Description xml:lang="en">The zlib library is a compression library that aims to be unobtrusive.
-</Description>
+ <Description xml:lang="en">The zlib library is a compression library that aims to be unobtrusive.</Description>
<PartOf>system.base</PartOf>
<Files>
<Path fileType="library">/usr/lib64/lib*.so.*</Path>
@@ -27,11 +25,10 @@
<Package>
<Name>zlib-32bit</Name>
<Summary xml:lang="en">32-bit libraries for zlib</Summary>
- <Description xml:lang="en">The zlib library is a compression library that aims to be unobtrusive.
-</Description>
+ <Description xml:lang="en">The zlib library is a compression library that aims to be unobtrusive.</Description>
<PartOf>emul32</PartOf>
<RuntimeDependencies>
- <Dependency release="14">zlib</Dependency>
+ <Dependency release="15">zlib</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="library">/usr/lib32/lib*.so.*</Path>
@@ -40,12 +37,11 @@
<Package>
<Name>zlib-32bit-devel</Name>
<Summary xml:lang="en">Development files for 32-bit zlib</Summary>
- <Description xml:lang="en">The zlib library is a compression library that aims to be unobtrusive.
-</Description>
+ <Description xml:lang="en">The zlib library is a compression library that aims to be unobtrusive.</Description>
<PartOf>programming.devel</PartOf>
<RuntimeDependencies>
- <Dependency release="14">zlib-devel</Dependency>
- <Dependency release="14">zlib-32bit</Dependency>
+ <Dependency release="15">zlib-devel</Dependency>
+ <Dependency release="15">zlib-32bit</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="library">/usr/lib32/lib*.a</Path>
@@ -56,11 +52,10 @@
<Package>
<Name>zlib-devel</Name>
<Summary xml:lang="en">Development files for zlib</Summary>
- <Description xml:lang="en">The zlib library is a compression library that aims to be unobtrusive.
-</Description>
+ <Description xml:lang="en">The zlib library is a compression library that aims to be unobtrusive.</Description>
<PartOf>system.devel</PartOf>
<RuntimeDependencies>
- <Dependency release="14">zlib</Dependency>
+ <Dependency release="15">zlib</Dependency>
</RuntimeDependencies>
<Files>
<Path fileType="header">/usr/include/</Path>
@@ -69,13 +64,38 @@
<Path fileType="data">/usr/lib64/pkgconfig/*.pc</Path>
</Files>
</Package>
+ <Package>
+ <Name>zlib-minizip</Name>
+ <Summary xml:lang="en">Mini zip and unzip based on zlib</Summary>
+ <Description xml:lang="en">Mini zip and unzip based on zlib</Description>
+ <RuntimeDependencies>
+ <Dependency release="15">zlib</Dependency>
+ </RuntimeDependencies>
+ <Files>
+ <Path fileType="header">/usr/include/minizip/*</Path>
+ <Path fileType="library">/usr/lib64/libminizip.*</Path>
+ <Path fileType="data">/usr/lib64/pkgconfig/minizip.pc</Path>
+ </Files>
+ </Package>
+ <Package>
+ <Name>zlib-minizip-32bit</Name>
+ <Summary xml:lang="en">Mini zip and unzip based on zlib</Summary>
+ <Description xml:lang="en">Mini zip and unzip based on zlib</Description>
+ <RuntimeDependencies>
+ <Dependency release="15">zlib-32bit</Dependency>
+ </RuntimeDependencies>
+ <Files>
+ <Path fileType="library">/usr/lib32/libminizip.*</Path>
+ <Path fileType="data">/usr/lib32/pkgconfig/minizip.pc</Path>
+ </Files>
+ </Package>
<History>
- <Update release="14">
- <Date>2017-04-12</Date>
+ <Update release="15">
+ <Date>2017-08-07</Date>
<Version>1.2.11</Version>
<Comment>Packaging update</Comment>
- <Name>Peter O'Connor</Name>
- <Email>peter@solus-project.com</Email>
+ <Name>Matthias Eliasson</Name>
+ <Email>matthias.eliasson@gmail.com</Email>
</Update>
</History>
</PISI>
\ No newline at end of file
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Jun 6 2023, 10:05 PM (8 w, 6 d ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5814001
Default Alt Text
D783.id1714.diff (11 KB)
Attached To
Mode
D783: build and add minizip from contrib
Attached
Detach File
Event Timeline
Log In to Comment