[packages/libsmraw] - updated to 20181227 (alpha) - removed obsolete system-libs patch
qboosh
qboosh at pld-linux.org
Thu Jul 18 20:47:19 CEST 2019
commit f36312d105bf2e5e2fd13c9ba10c3816fb11b5ae
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Thu Jul 18 20:49:08 2019 +0200
- updated to 20181227 (alpha)
- removed obsolete system-libs patch
libsmraw-system-libs.patch | 96 ---------------------------
libsmraw.spec | 162 +++++++++++++++++++++++++++------------------
2 files changed, 99 insertions(+), 159 deletions(-)
---
diff --git a/libsmraw.spec b/libsmraw.spec
index 7de69d2..e990430 100644
--- a/libsmraw.spec
+++ b/libsmraw.spec
@@ -1,57 +1,75 @@
#
# Conditional build:
-%bcond_without python # Python bindings
+%bcond_without python # Python bindings (any)
+%bcond_without python2 # CPython 2.x bindings
+%bcond_without python3 # CPython 3.x bindings
#
+%if %{without python}
+%undefine with_python2
+%undefine with_python3
+%endif
+# see m4/${libname}.m4 />= for required version of particular library
+%define libbfio_ver 20160108
+%define libcdata_ver 20181216
+%define libcerror_ver 20120425
+%define libcfile_ver 20160409
+%define libclocale_ver 20120425
+%define libcnotify_ver 20120425
+%define libcpath_ver 20180716
+%define libcsplit_ver 20120701
+%define libcthreads_ver 20160404
+%define libfcache_ver 20181010
+%define libfdata_ver 20181009
+%define libfvalue_ver 20160131
+%define libhmac_ver 20160802
+%define libuna_ver 20181006
Summary: Library to access the storage media (SM) (split) RAW format
Summary(pl.UTF-8): Biblioteka służąca do dostępu do surowego (dzielonego) formatu nośnika danych (SM)
Name: libsmraw
-Version: 20150105
-Release: 3
+Version: 20181227
+Release: 1
License: LGPL v3+
Group: Libraries
-Source0: https://github.com/libyal/libsmraw/archive/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 0f40bc041ec5d22083cee46091ef6205
-Patch0: %{name}-system-libs.patch
+#Source0Download: https://github.com/libyal/libsmraw/releases
+Source0: https://github.com/libyal/libsmraw/releases/download/%{version}/%{name}-alpha-%{version}.tar.gz
+# Source0-md5: 510ccfd38ad5b13b173759224267fcfa
URL: https://github.com/libyal/libsmraw/
BuildRequires: autoconf >= 2.59
BuildRequires: automake >= 1.6
BuildRequires: gettext-tools >= 0.18.1
-BuildRequires: libbfio-devel >= 20120426
-BuildRequires: libcdata-devel >= 20150102
-BuildRequires: libcerror-devel >= 20120425
-BuildRequires: libcfile-devel >= 20140503
-BuildRequires: libclocale-devel >= 20120425
-BuildRequires: libcnotify-devel >= 20120425
-BuildRequires: libcpath-devel >= 20120701
-BuildRequires: libcsplit-devel >= 20120701
-BuildRequires: libcstring-devel >= 20120425
-BuildRequires: libcsystem-devel >= 20141018
-BuildRequires: libcthreads-devel >= 20130509
-BuildRequires: libfcache-devel >= 20140601
-BuildRequires: libfdata-devel >= 20140915
+BuildRequires: libbfio-devel >= %{libbfio_ver}
+BuildRequires: libcdata-devel >= %{libcdata_ver}
+BuildRequires: libcerror-devel >= %{libcerror_ver}
+BuildRequires: libcfile-devel >= %{libcfile_ver}
+BuildRequires: libclocale-devel >= %{libclocale_ver}
+BuildRequires: libcnotify-devel >= %{libcnotify_ver}
+BuildRequires: libcpath-devel >= %{libcpath_ver}
+BuildRequires: libcsplit-devel >= %{libcsplit_ver}
+BuildRequires: libcthreads-devel >= %{libcthreads_ver}
+BuildRequires: libfcache-devel >= %{libfcache_ver}
+BuildRequires: libfdata-devel >= %{libfdata_ver}
BuildRequires: libfuse-devel >= 2.6
-BuildRequires: libfvalue-devel >= 20130415
-BuildRequires: libhmac-devel >= 20130714
-BuildRequires: libuna-devel >= 20120425
+BuildRequires: libfvalue-devel >= %{libfvalue_ver}
+BuildRequires: libhmac-devel >= %{libhmac_ver}
+BuildRequires: libuna-devel >= %{libuna_ver}
BuildRequires: libtool
BuildRequires: openssl-devel >= 1.0
BuildRequires: pkgconfig
-%{?with_python:BuildRequires: python-devel >= 1:2.5}
-BuildRequires: sed >= 4.0
-Requires: libbfio >= 20120426
-Requires: libcdata >= 20150102
-Requires: libcerror >= 20120425
-Requires: libcfile >= 20140503
-Requires: libclocale >= 20120425
-Requires: libcnotify >= 20120425
-Requires: libcpath >= 20120701
-Requires: libcsplit >= 20120701
-Requires: libcstring >= 20120425
-Requires: libcthreads >= 20130509
-Requires: libfcache >= 20140601
-Requires: libfdata >= 20140915
-Requires: libfvalue >= 20130415
-Requires: libuna >= 20120425
+%{?with_python2:BuildRequires: python-devel >= 1:2.5}
+%{?with_python3:BuildRequires: python3-devel >= 1:3.2}
+Requires: libbfio >= %{libbfio_ver}
+Requires: libcdata >= %{libcdata_ver}
+Requires: libcerror >= %{libcerror_ver}
+Requires: libcfile >= %{libcfile_ver}
+Requires: libclocale >= %{libclocale_ver}
+Requires: libcnotify >= %{libcnotify_ver}
+Requires: libcpath >= %{libcpath_ver}
+Requires: libcsplit >= %{libcsplit_ver}
+Requires: libcthreads >= %{libcthreads_ver}
+Requires: libfcache >= %{libfcache_ver}
+Requires: libfdata >= %{libfdata_ver}
+Requires: libfvalue >= %{libfvalue_ver}
+Requires: libuna >= %{libuna_ver}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -67,20 +85,19 @@ Summary: Header files for libsmraw library
Summary(pl.UTF-8): Pliki nagłówkowe biblioteki libsmraw
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
-Requires: libbfio-devel >= 20120426
-Requires: libcdata-devel >= 20150102
-Requires: libcerror-devel >= 20120425
-Requires: libcfile-devel >= 20140503
-Requires: libclocale-devel >= 20120425
-Requires: libcnotify-devel >= 20120425
-Requires: libcpath-devel >= 20120701
-Requires: libcsplit-devel >= 20120701
-Requires: libcstring-devel >= 20120425
-Requires: libcthreads-devel >= 20130509
-Requires: libfcache-devel >= 20140601
-Requires: libfdata-devel >= 20140915
-Requires: libfvalue-devel >= 20130415
-Requires: libuna-devel >= 20120425
+Requires: libbfio-devel >= %{libbfio_ver}
+Requires: libcdata-devel >= %{libcdata_ver}
+Requires: libcerror-devel >= %{libcerror_ver}
+Requires: libcfile-devel >= %{libcfile_ver}
+Requires: libclocale-devel >= %{libclocale_ver}
+Requires: libcnotify-devel >= %{libcnotify_ver}
+Requires: libcpath-devel >= %{libcpath_ver}
+Requires: libcsplit-devel >= %{libcsplit_ver}
+Requires: libcthreads-devel >= %{libcthreads_ver}
+Requires: libfcache-devel >= %{libfcache_ver}
+Requires: libfdata-devel >= %{libfdata_ver}
+Requires: libfvalue-devel >= %{libfvalue_ver}
+Requires: libuna-devel >= %{libuna_ver}
%description devel
Header files for libsmraw library.
@@ -105,9 +122,8 @@ Summary: Tools for libsmraw library
Summary(pl.UTF-8): Narzędzia do biblioteki smraw
Group: Applications/System
Requires: %{name} = %{version}-%{release}
-Requires: libcsystem >= 20141018
Requires: libfuse >= 2.6
-Requires: libhmac >= 20130714
+Requires: libhmac >= %{libhmac_ver}
%description tools
Tools for libsmraw library.
@@ -116,31 +132,42 @@ Tools for libsmraw library.
Narzędzia do biblioteki smraw.
%package -n python-pysmraw
-Summary: Python bindings for libsmraw library
-Summary(pl.UTF-8): Wiązania Pythona do biblioteki libsmraw
+Summary: Python 2 bindings for libsmraw library
+Summary(pl.UTF-8): Wiązania Pythona 2 do biblioteki libsmraw
Group: Libraries/Python
Requires: %{name} = %{version}-%{release}
%description -n python-pysmraw
-Python bindings for libsmraw library.
+Python 2 bindings for libsmraw library.
%description -n python-pysmraw -l pl.UTF-8
-Wiązania Pythona do biblioteki libsmraw.
+Wiązania Pythona 2 do biblioteki libsmraw.
+
+%package -n python3-pysmraw
+Summary: Python 3 bindings for libsmraw library
+Summary(pl.UTF-8): Wiązania Pythona 3 do biblioteki libsmraw
+Group: Libraries/Python
+Requires: %{name} = %{version}-%{release}
+
+%description -n python3-pysmraw
+Python 3 bindings for libsmraw library.
+
+%description -n python3-pysmraw -l pl.UTF-8
+Wiązania Pythona 3 do biblioteki libsmraw.
%prep
%setup -q
-%patch0 -p1
%build
%{__gettextize}
-%{__sed} -i -e 's/ po\/Makefile.in//' configure.ac
%{__libtoolize}
%{__aclocal} -I m4
%{__autoconf}
%{__autoheader}
%{__automake}
%configure \
- %{?with_python:--enable-python}
+ %{?with_python2:--enable-python2} \
+ %{?with_python3:--enable-python3}
%{__make}
%install
@@ -152,9 +179,12 @@ rm -rf $RPM_BUILD_ROOT
# obsoleted by pkg-config
%{__rm} $RPM_BUILD_ROOT%{_libdir}/libsmraw.la
-%if %{with python}
+%if %{with python2}
%{__rm} $RPM_BUILD_ROOT%{py_sitedir}/pysmraw.{la,a}
%endif
+%if %{with python3}
+%{__rm} $RPM_BUILD_ROOT%{py3_sitedir}/pysmraw.{la,a}
+%endif
%clean
rm -rf $RPM_BUILD_ROOT
@@ -186,8 +216,14 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_bindir}/smrawverify
%{_mandir}/man1/smrawmount.1*
-%if %{with python}
+%if %{with python2}
%files -n python-pysmraw
%defattr(644,root,root,755)
%attr(755,root,root) %{py_sitedir}/pysmraw.so
%endif
+
+%if %{with python3}
+%files -n python3-pysmraw
+%defattr(644,root,root,755)
+%attr(755,root,root) %{py3_sitedir}/pysmraw.so
+%endif
diff --git a/libsmraw-system-libs.patch b/libsmraw-system-libs.patch
deleted file mode 100644
index fa9d2ad..0000000
--- a/libsmraw-system-libs.patch
+++ /dev/null
@@ -1,96 +0,0 @@
---- libsmraw-20150105/configure.ac.orig 2015-01-24 10:31:46.646431352 +0100
-+++ libsmraw-20150105/configure.ac 2015-01-24 10:59:33.343028074 +0100
-@@ -318,23 +318,7 @@ dnl Have configure make the Makefiles
- AC_CONFIG_FILES([Makefile])
- AC_CONFIG_FILES([include/Makefile])
- AC_CONFIG_FILES([common/Makefile])
--AC_CONFIG_FILES([libcstring/Makefile])
--AC_CONFIG_FILES([libcerror/Makefile])
--AC_CONFIG_FILES([libcthreads/Makefile])
--AC_CONFIG_FILES([libcdata/Makefile])
--AC_CONFIG_FILES([libclocale/Makefile])
--AC_CONFIG_FILES([libcnotify/Makefile])
--AC_CONFIG_FILES([libcsplit/Makefile])
--AC_CONFIG_FILES([libuna/Makefile])
--AC_CONFIG_FILES([libcfile/Makefile])
--AC_CONFIG_FILES([libcpath/Makefile])
--AC_CONFIG_FILES([libbfio/Makefile])
--AC_CONFIG_FILES([libfcache/Makefile])
--AC_CONFIG_FILES([libfdata/Makefile])
--AC_CONFIG_FILES([libfvalue/Makefile])
- AC_CONFIG_FILES([libsmraw/Makefile])
--AC_CONFIG_FILES([libcsystem/Makefile])
--AC_CONFIG_FILES([libhmac/Makefile])
- AC_CONFIG_FILES([smrawtools/Makefile])
- AC_CONFIG_FILES([smraw.net/Makefile])
- AC_CONFIG_FILES([pysmraw/Makefile])
---- libsmraw-20150105/Makefile.am.orig 2015-01-24 10:31:45.976431381 +0100
-+++ libsmraw-20150105/Makefile.am 2015-01-24 10:59:56.559693767 +0100
-@@ -3,23 +3,7 @@ ACLOCAL_AMFLAGS = -I m4
- SUBDIRS = \
- include \
- common \
-- libcstring \
-- libcerror \
-- libcthreads \
-- libcdata \
-- libclocale \
-- libcnotify \
-- libcsplit \
-- libuna \
-- libcfile \
-- libcpath \
-- libbfio \
-- libfcache \
-- libfdata \
-- libfvalue \
- libsmraw \
-- libcsystem \
-- libhmac \
- smrawtools \
- smraw.net \
- pysmraw \
-@@ -73,20 +57,6 @@ lib: library
-
- library:
- (cd $(srcdir)/common && $(MAKE) $(AM_MAKEFLAGS))
-- (cd $(srcdir)/libcstring && $(MAKE) $(AM_MAKEFLAGS))
-- (cd $(srcdir)/libcerror && $(MAKE) $(AM_MAKEFLAGS))
-- (cd $(srcdir)/libcthreads && $(MAKE) $(AM_MAKEFLAGS))
-- (cd $(srcdir)/libcdata && $(MAKE) $(AM_MAKEFLAGS))
-- (cd $(srcdir)/libclocale && $(MAKE) $(AM_MAKEFLAGS))
-- (cd $(srcdir)/libcnotify && $(MAKE) $(AM_MAKEFLAGS))
-- (cd $(srcdir)/libcsplit && $(MAKE) $(AM_MAKEFLAGS))
-- (cd $(srcdir)/libuna && $(MAKE) $(AM_MAKEFLAGS))
-- (cd $(srcdir)/libcfile && $(MAKE) $(AM_MAKEFLAGS))
-- (cd $(srcdir)/libcpath && $(MAKE) $(AM_MAKEFLAGS))
-- (cd $(srcdir)/libbfio && $(MAKE) $(AM_MAKEFLAGS))
-- (cd $(srcdir)/libfcache && $(MAKE) $(AM_MAKEFLAGS))
-- (cd $(srcdir)/libfdata && $(MAKE) $(AM_MAKEFLAGS))
-- (cd $(srcdir)/libfvalue && $(MAKE) $(AM_MAKEFLAGS))
- (cd $(srcdir)/libsmraw && $(MAKE) $(AM_MAKEFLAGS))
- (cd $(srcdir)/po && $(MAKE) $(AM_MAKEFLAGS))
-
-@@ -103,22 +73,7 @@ distclean: clean
- done && test -z "$$fail"
-
- splint:
-- (cd $(srcdir)/libcstring && $(MAKE) splint $(AM_MAKEFLAGS))
-- (cd $(srcdir)/libcerror && $(MAKE) splint $(AM_MAKEFLAGS))
-- (cd $(srcdir)/libcthreads && $(MAKE) splint $(AM_MAKEFLAGS))
-- (cd $(srcdir)/libcdata && $(MAKE) splint $(AM_MAKEFLAGS))
-- (cd $(srcdir)/libclocale && $(MAKE) splint $(AM_MAKEFLAGS))
-- (cd $(srcdir)/libcnotify && $(MAKE) splint $(AM_MAKEFLAGS))
-- (cd $(srcdir)/libcsplit && $(MAKE) splint $(AM_MAKEFLAGS))
-- (cd $(srcdir)/libuna && $(MAKE) splint $(AM_MAKEFLAGS))
-- (cd $(srcdir)/libcfile && $(MAKE) splint $(AM_MAKEFLAGS))
-- (cd $(srcdir)/libcpath && $(MAKE) splint $(AM_MAKEFLAGS))
-- (cd $(srcdir)/libbfio && $(MAKE) splint $(AM_MAKEFLAGS))
-- (cd $(srcdir)/libfcache && $(MAKE) splint $(AM_MAKEFLAGS))
-- (cd $(srcdir)/libfdata && $(MAKE) splint $(AM_MAKEFLAGS))
-- (cd $(srcdir)/libfvalue && $(MAKE) splint $(AM_MAKEFLAGS))
- (cd $(srcdir)/libsmraw && $(MAKE) splint $(AM_MAKEFLAGS))
-- (cd $(srcdir)/libcsystem && $(MAKE) splint $(AM_MAKEFLAGS))
- (cd $(srcdir)/smrawtools && $(MAKE) splint $(AM_MAKEFLAGS))
- (cd $(srcdir)/smraw.net && $(MAKE) splint $(AM_MAKEFLAGS))
- (cd $(srcdir)/pysmraw && $(MAKE) splint $(AM_MAKEFLAGS))
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libsmraw.git/commitdiff/f36312d105bf2e5e2fd13c9ba10c3816fb11b5ae
More information about the pld-cvs-commit
mailing list