[zipios++] Cleanup spec file for submission to Fedora.
Richard Shaw
hobbes1069 at fedoraproject.org
Tue Apr 17 21:10:50 UTC 2012
commit d36538f979c9c278bd47e4602c449e26f523adf6
Author: Richard M. Shaw <hobbes1069 at gmail.com>
Date: Tue Apr 17 16:10:48 2012 -0500
Cleanup spec file for submission to Fedora.
- Reference Debian source since upstream is dead.
.gitignore | 1 +
sources | 1 +
zipios++-amd64_fix.patch | 34 ++++++++++
zipios++-appendzip.cstdlib.patch | 7 ++
zipios++-fc16-ptrdiff_t.patch | 12 ++++
zipios++.spec | 124 ++++++++++++++++++++++++++++++++++++++
6 files changed, 179 insertions(+), 0 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index e69de29..0f803c9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -0,0 +1 @@
+/zipios++_0.1.5.9+cvs.2007.04.28.orig.tar.gz
diff --git a/sources b/sources
index e69de29..eb45d59 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+cb321973d3ab5f39ee0df77ef0af7929 zipios++_0.1.5.9+cvs.2007.04.28.orig.tar.gz
diff --git a/zipios++-amd64_fix.patch b/zipios++-amd64_fix.patch
new file mode 100644
index 0000000..0364247
--- /dev/null
+++ b/zipios++-amd64_fix.patch
@@ -0,0 +1,34 @@
+diff -urN zipios++-0.1.5.9+cvs.2007.04.28.orig/zipios++/meta-iostreams.h zipios++-0.1.5.9+cvs.2007.04.28/zipios++/meta-iostreams.h
+--- zipios++-0.1.5.9+cvs.2007.04.28.orig/zipios++/meta-iostreams.h 2007-04-30 10:18:49.000000000 +0900
++++ zipios++-0.1.5.9+cvs.2007.04.28/zipios++/meta-iostreams.h 2007-04-30 10:19:25.000000000 +0900
+@@ -7,11 +7,6 @@
+
+ #include <iostream>
+ #include <fstream>
+-
+-#if defined (HAVE_STD_IOSTREAM) && defined (USE_STD_IOSTREAM)
+ #include <sstream>
+-#else
+-#include <strstream>
+-#endif
+
+ #endif
+diff -urN zipios++-0.1.5.9+cvs.2007.04.28.orig/zipios++/zipios_defs.h zipios++-0.1.5.9+cvs.2007.04.28/zipios++/zipios_defs.h
+--- zipios++-0.1.5.9+cvs.2007.04.28.orig/zipios++/zipios_defs.h 2007-04-30 10:18:49.000000000 +0900
++++ zipios++-0.1.5.9+cvs.2007.04.28/zipios++/zipios_defs.h 2007-04-30 10:19:02.000000000 +0900
+@@ -1,10 +1,13 @@
+ #ifndef ZIPIOS_DEFS_H
+ #define ZIPIOS_DEFS_H
+
++#include "zipios++/zipios-config.h"
++#include <stdint.h>
++
+ namespace zipios {
+
+-typedef unsigned short uint16 ;
+-typedef unsigned long uint32 ;
++typedef uint16_t uint16 ;
++typedef uint32_t uint32 ;
+
+ } // namespace
+
diff --git a/zipios++-appendzip.cstdlib.patch b/zipios++-appendzip.cstdlib.patch
new file mode 100644
index 0000000..ff8137d
--- /dev/null
+++ b/zipios++-appendzip.cstdlib.patch
@@ -0,0 +1,7 @@
+--- zipios++-0.1.5/src/appendzip.cpp~ 2000-08-25 14:12:53.000000000 -0500
++++ zipios++-0.1.5/src/appendzip.cpp 2011-07-12 09:53:13.824178438 -0500
+@@ -1,3 +1,4 @@
++#include <cstdlib>
+ #include "zipios++/zipios-config.h"
+
+ #include "zipios++/meta-iostreams.h"
diff --git a/zipios++-fc16-ptrdiff_t.patch b/zipios++-fc16-ptrdiff_t.patch
new file mode 100644
index 0000000..017d847
--- /dev/null
+++ b/zipios++-fc16-ptrdiff_t.patch
@@ -0,0 +1,12 @@
+diff -ruN zipios++-0.1.5.9+cvs.2007.04.28.orig/src/directory.h zipios++-0.1.5.9+cvs.2007.04.28/src/directory.h
+--- zipios++-0.1.5.9+cvs.2007.04.28.orig/src/directory.h 2003-01-04 06:45:34.000000000 +0800
++++ zipios++-0.1.5.9+cvs.2007.04.28/src/directory.h 2012-01-24 22:30:20.362767134 +0800
+@@ -56,6 +56,8 @@
+
+ namespace boost
+ {
++ using std::ptrdiff_t;
++
+ namespace filesystem
+ {
+ class dir_it;
diff --git a/zipios++.spec b/zipios++.spec
new file mode 100644
index 0000000..b859425
--- /dev/null
+++ b/zipios++.spec
@@ -0,0 +1,124 @@
+# define these if using CVS version
+%global cvs_date 2007.04.28
+%global cvs_ver +cvs.%cvs_date
+
+Name: zipios++
+Version: 0.1.5.9
+Release: 6%{dist}
+License: LGPLv2+
+Summary: C++ library for reading and writing Zip files
+Summary(pl.UTF-8): Biblioteka C++ do odczytu i zapisu plików Zip
+Group: System Environment/Libraries
+URL: http://zipios.sourceforge.net/
+# Upstream is dead. Using updated Debian source as they are fixing FTBFS issues.
+Source0: ftp://ftp.debian.org/debian/pool/main/z/%{name}/%{name}_%{version}%{cvs_ver}.orig.tar.gz
+
+Patch0: zipios++-appendzip.cstdlib.patch
+Patch1: zipios++-amd64_fix.patch
+Patch2: zipios++-fc16-ptrdiff_t.patch
+
+BuildRequires: automake
+BuildRequires: autoconf
+BuildRequires: libstdc++-devel
+BuildRequires: libtool
+BuildRequires: zlib-devel
+BuildRequires: cppunit-devel
+BuildRequires: graphviz
+BuildRequires: ImageMagick
+BuildRequires: doxygen
+
+
+%description
+Zipios++ is a java.util.zip-like C++ library for reading and writing
+Zip files. Access to individual entries is provided through standard
+C++ iostreams. A simple read-only virtual file system that mounts
+regular directories and zip files is also provided.
+
+%description -l pl.UTF-8
+Zipios++ jest jak java.util.zip biblioteką C++ do odczytywania oraz
+zapisywania plików Zip. Dostęp do pojedyńczych wpisów jest możliwy
+poprzez standardowe strumienie we/wy C++. Prosty wirtualny system
+plików (tylko do odczytu) montujący regularne katalogi oraz pliki zip
+również jest dostarczany.
+
+
+%package devel
+Summary: Header files for zipios++
+Summary(pl.UTF-8): Pliki nagłówkowe zipios++
+Group: Development/Libraries
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: libstdc++-devel
+Requires: zlib-devel
+
+%description devel
+The header files are only needed for development of programs using the
+zipios++.
+
+%description devel -l pl.UTF-8
+W pakiecie tym znajdują się pliki nagłówkowe, przeznaczone dla
+programistów używających bibliotek zipios++.
+
+
+%prep
+%setup -q -n %{name}-%{version}%{cvs_ver}
+
+%patch0 -p1 -b .cstdlib
+%patch1 -p1 -b .amd64
+%patch2 -p1 -b .ptrdiff_t
+
+chmod 0644 COPYING
+
+
+%build
+autoreconf -if
+%configure
+make %{?_smp_mflags}
+make doc
+
+
+%install
+make install DESTDIR=%{buildroot}
+
+# Remove static libs
+rm -f %{buildroot}%{_libdir}/*.{a,la}
+
+
+%post -p /sbin/ldconfig
+%postun -p /sbin/ldconfig
+
+
+%files
+%doc AUTHORS COPYING NEWS README
+%{_libdir}/*.so.*
+
+%files devel
+%doc doc/html
+%{_libdir}/*.so
+%{_includedir}/zipios++
+
+
+%changelog
+* Tue Apr 10 2012 Richard Shaw <hobbes1069 at gmail.com> - 0.1.5.9-5
+- Cleanup spec file for submission to Fedora.
+- Reference Debian source since upstream is dead.
+
+* Thu Mar 29 2012 <jman at greaser.zultron.com> - 0.1.5.9-4
+- Rebuild in koji
+
+* Tue Mar 13 2012 <jman at greaser.zultron.com> - 0.1.5.9-3
+- Add forgotten 'BuildRequires' entries
+
+* Tue Jan 24 2012 John Morris <jman at caps.zultron.com> - 0.1.5.9-2
+- Building for F16
+- Adding "using std::ptrdiff_t" hack to get compilation to work; someone who knows C++ should examine this
+
+* Sat Jul 16 2011 <jman at caps.zultron.com> - 0.1.5.9-1
+- update RPM to version used in Ubuntu (known to work with FreeCAD)
+- configure script exists; remove autoconf steps
+
+* Thu Jul 14 2011 <jman at zultron.com> - 0.1.5-6
+- patch "void zipios::ZipOutputStream::putNextEntry (const std::string & entryName)" back into headers: putNextEntry-header.patch
+
+* Tue Jul 12 2011 <jman at zultron.com> - 0.1.5-5
+- C++ header dependency cleanups in patch4; see http://gcc.gnu.org/gcc-4.3/porting_to.html
+- Changes for Fedora 13
More information about the scm-commits
mailing list