diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..4e881d4 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +/zimlib-1.0.tar.gz +/4.0.5.tar.gz +/4.0.6.tar.gz diff --git a/dead.package b/dead.package deleted file mode 100644 index dcb5a86..0000000 --- a/dead.package +++ /dev/null @@ -1 +0,0 @@ -Renamed to libzim. diff --git a/sources b/sources new file mode 100644 index 0000000..b97ec76 --- /dev/null +++ b/sources @@ -0,0 +1 @@ +SHA512 (4.0.6.tar.gz) = 163777ec1e3935b1e71cc30c72a5645c8519592ad30aa544b08fbdfc0f5c50a7d4199d9038028209fa9accc0e2264008aa8931c49e831273ce2b9a6c4062ad37 diff --git a/zimlib-fix-flags.patch b/zimlib-fix-flags.patch new file mode 100644 index 0000000..63a16b0 --- /dev/null +++ b/zimlib-fix-flags.patch @@ -0,0 +1,25 @@ +From f28658b6dd722e548e93f5d45a03ac7c8d078501 Mon Sep 17 00:00:00 2001 +From: Vitaly Zaitsev +Date: Wed, 10 Apr 2019 14:57:47 +0200 +Subject: [PATCH 2/2] Removed Werror build flag. + +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 2d38684..42e5253 100644 +--- a/meson.build ++++ b/meson.build +@@ -1,7 +1,7 @@ + project('libzim', ['c', 'cpp'], + version : '4.0.6', + license : 'GPL2', +- default_options : ['c_std=c11', 'cpp_std=c++11', 'werror=true']) ++ default_options : ['c_std=c11', 'cpp_std=c++11']) + + if build_machine.system() != 'windows' + add_project_arguments('-D_LARGEFILE64_SOURCE=1', '-D_FILE_OFFSET_BITS=64', language: 'cpp') +-- +2.20.1 + diff --git a/zimlib-no-rpath.patch b/zimlib-no-rpath.patch new file mode 100644 index 0000000..46279e7 --- /dev/null +++ b/zimlib-no-rpath.patch @@ -0,0 +1,26 @@ +From dd7e0ec915e4ad782328b496677bf7b122282560 Mon Sep 17 00:00:00 2001 +From: Vitaly Zaitsev +Date: Wed, 10 Apr 2019 14:31:32 +0200 +Subject: [PATCH 1/2] Removed Rpath build. + +--- + src/meson.build | 4 +--- + 1 file changed, 1 insertion(+), 3 deletions(-) + +diff --git a/src/meson.build b/src/meson.build +index 671a23f..003047d 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -71,8 +71,6 @@ libzim = library('zim', + link_args : extra_link_args, + cpp_args : extra_cpp_args, + version: meson.project_version(), +- install : true, +- build_rpath : join_paths(get_option('prefix'), get_option('libdir')), +- install_rpath: '$ORIGIN') ++ install : true) + libzim_dep = declare_dependency(link_with: libzim, + include_directories: include_directory) +-- +2.20.1 + diff --git a/zimlib.spec b/zimlib.spec new file mode 100644 index 0000000..6348acf --- /dev/null +++ b/zimlib.spec @@ -0,0 +1,139 @@ +%global appname libzim + +Name: zimlib +Version: 4.0.6 +Release: 3%{?dist} + +License: GPLv2 and ASL 2.0 and BSD +Summary: Reference implementation of the ZIM specification + +URL: https://github.com/openzim/%{appname} +Source0: %{url}/archive/%{version}.tar.gz +Patch0: %{name}-no-rpath.patch +Patch1: %{name}-fix-flags.patch + +BuildRequires: xapian-core-devel +BuildRequires: libicu-devel +BuildRequires: gtest-devel +BuildRequires: ninja-build +BuildRequires: zlib-devel +BuildRequires: xz-devel +BuildRequires: gcc-c++ +BuildRequires: meson +BuildRequires: gcc + +%description +The ZIM library is the reference implementation for the ZIM file +format. It's a solution to read and write ZIM files on many systems +and architectures. + +%package devel +Summary: Development files for %{name} +Requires: %{name}%{?_isa} = %{?epoch:%{epoch}:}%{version}-%{release} + +%description devel +%{summary}. + +%prep +%autosetup -n %{appname}-%{version} -p1 + +%build +%meson +%meson_build + +%install +%meson_install + +%files +%doc AUTHORS ChangeLog README.md +%license COPYING +%{_libdir}/%{appname}.so.4* + +%files devel +%{_includedir}/zim +%{_libdir}/%{appname}.so +%{_libdir}/pkgconfig/%{appname}.pc + +%changelog +* Wed Apr 10 2019 Vitaly Zaitsev - 4.0.6-3 +- Removed Werror build flag. + +* Wed Apr 10 2019 Vitaly Zaitsev - 4.0.6-2 +- Removed rpath. + +* Wed Apr 10 2019 Vitaly Zaitsev - 4.0.6-1 +- Updated to version 4.0.6. + +* Tue Mar 19 2019 Vitaly Zaitsev - 4.0.5-1 +- Updated to version 4.0.5. +- Major SPEC cleanup. + +* Sun Feb 03 2019 Fedora Release Engineering - 1.0-18 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + +* Sat Jul 14 2018 Fedora Release Engineering - 1.0-17 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + +* Fri Feb 09 2018 Fedora Release Engineering - 1.0-16 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild + +* Thu Aug 03 2017 Fedora Release Engineering - 1.0-15 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 1.0-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Mon May 15 2017 Fedora Release Engineering - 1.0-13 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_27_Mass_Rebuild + +* Sat Feb 11 2017 Fedora Release Engineering - 1.0-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild + +* Fri Feb 05 2016 Fedora Release Engineering - 1.0-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild + +* Fri Jun 19 2015 Fedora Release Engineering - 1.0-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild + +* Sat May 02 2015 Kalev Lember - 1.0-9 +- Rebuilt for GCC 5 C++11 ABI change + +* Mon Aug 18 2014 Fedora Release Engineering - 1.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild + +* Sat Jun 07 2014 Fedora Release Engineering - 1.0-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild + +* Sun Aug 04 2013 Fedora Release Engineering - 1.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild + +* Fri Apr 26 2013 Micah Roth 1.0-5 +- forced INSTALL to preserve timestamps for non-compiled files + +* Thu Apr 25 2013 Micah Roth 1.0-4 +- --formal review volter-- +- removed INSTALL, NEWS, README files from %%docs +- added COPYING file to %%docs +- removed unnecessary commented lines and empty sections +- improved %%files devel section with asterisk removal and more specificity +- added spaces in the %%changelog area between updates + +* Tue Apr 23 2013 Micah Roth 1.0-3 +- --informal review volter-- +- updated descriptions to match %%files lists +- added --disable-static to %%configure + +* Sat Apr 20 2013 Micah Roth 1.0-2 +- added %%doc files +- removed commented lines +- removed --disable-static because it doesn't apply (right?) +- ---volter's informal review--- +- moved binaries to base package %%files list +- commented libtool BR +- uncommented removal of *la file(s) +- added macros into Source0 +- commented *a %%files list entry + +* Sat Apr 20 2013 Micah Roth 1.0-1 +- created spec file +- commented automake and autotools BRs as recommended by rdieter