commit 569465c4d42ab774be68ba44ab93d874e0a6446d
Author: Jakub Bogusz <[email protected]>
Date: Thu Jul 18 19:52:37 2019 +0200
- updated to 20190315 (alpha)
- removed obsolete system-libs patch
libsmdev-system-libs.patch | 68 ---------------------------
libsmdev.spec | 115 ++++++++++++++++++++++++++++-----------------
2 files changed, 72 insertions(+), 111 deletions(-)
---
diff --git a/libsmdev.spec b/libsmdev.spec
index 50bfb8a..64f3e7f 100644
--- a/libsmdev.spec
+++ b/libsmdev.spec
@@ -1,43 +1,53 @@
#
# 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 libcdata_ver 20190112
+%define libcerror_ver 20120425
+%define libcfile_ver 20160409
+%define libclocale_ver 20120425
+%define libcnotify_ver 20120425
+%define libcthreads_ver 20160404
+%define libuna_ver 20181006
Summary: Library to access and read storage media (SM) devices
Summary(pl.UTF-8): Biblioteka służąca do dostępu i odczytu urządzeń
nośników pamięci (SM)
Name: libsmdev
-Version: 20150105
-Release: 3
+Version: 20190315
+Release: 1
License: LGPL v3+
Group: Libraries
-Source0:
https://github.com/libyal/libsmdev/archive/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 872758d8c516785966cab26de58d7f1b
-Patch0: %{name}-system-libs.patch
+#Source0Download: https://github.com/libyal/libsmdev/releases
+Source0:
https://github.com/libyal/libsmdev/releases/download/%{version}/%{name}-alpha-%{version}.tar.gz
+# Source0-md5: d4438396d387f4074335846674a48508
URL: https://github.com/libyal/libsmdev/
BuildRequires: autoconf >= 2.59
BuildRequires: automake >= 1.6
BuildRequires: gettext-tools >= 0.18.1
-BuildRequires: libcdata-devel >= 20150102
-BuildRequires: libcerror-devel >= 20120425
-BuildRequires: libcfile-devel >= 20140503
-BuildRequires: libclocale-devel >= 20120425
-BuildRequires: libcnotify-devel >= 20120425
-BuildRequires: libcstring-devel >= 20120425
-BuildRequires: libcsystem-devel >= 20141018
-BuildRequires: libcthreads-devel >= 20130509
-BuildRequires: libuna-devel >= 20120425
+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: libcthreads-devel >= %{libcthreads_ver}
+BuildRequires: libuna-devel >= %{libuna_ver}
BuildRequires: libtool
BuildRequires: pkgconfig
-%{?with_python:BuildRequires: python-devel >= 1:2.5}
-BuildRequires: sed >= 4.0
-Requires: libcdata >= 20150102
-Requires: libcerror >= 20120425
-Requires: libcfile >= 20140503
-Requires: libclocale >= 20120425
-Requires: libcnotify >= 20120425
-Requires: libcstring >= 20120425
-Requires: libcsystem >= 20141018
-Requires: libcthreads >= 20130509
-Requires: libuna >= 20120425
+%{?with_python2:BuildRequires: python-devel >= 1:2.5}
+%{?with_python3:BuildRequires: python3-devel >= 1:3.2}
+Requires: libcdata >= %{libcdata_ver}
+Requires: libcerror >= %{libcerror_ver}
+Requires: libcfile >= %{libcfile_ver}
+Requires: libclocale >= %{libclocale_ver}
+Requires: libcnotify >= %{libcnotify_ver}
+Requires: libcthreads >= %{libcthreads_ver}
+Requires: libuna >= %{libuna_ver}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -52,14 +62,13 @@ Summary: Header files for libsmdev library
Summary(pl.UTF-8): Pliki nagłówkowe biblioteki libsmdev
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
-Requires: libcdata-devel >= 20150102
-Requires: libcerror-devel >= 20120425
-Requires: libcfile-devel >= 20140503
-Requires: libclocale-devel >= 20120425
-Requires: libcnotify-devel >= 20120425
-Requires: libcstring-devel >= 20120425
-Requires: libcthreads-devel >= 20130509
-Requires: libuna-devel >= 20120425
+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: libcthreads-devel >= %{libcthreads_ver}
+Requires: libuna-devel >= %{libuna_ver}
%description devel
Header files for libsmdev library.
@@ -80,31 +89,42 @@ Static libsmdev library.
Statyczna biblioteka libsmdev.
%package -n python-pysmdev
-Summary: Python bindings for libsmdev library
-Summary(pl.UTF-8): Wiązania Pythona do biblioteki libsmdev
+Summary: Python 2 bindings for libsmdev library
+Summary(pl.UTF-8): Wiązania Pythona 2 do biblioteki libsmdev
Group: Libraries/Python
Requires: %{name} = %{version}-%{release}
%description -n python-pysmdev
-Python bindings for libsmdev library.
+Python 2 bindings for libsmdev library.
%description -n python-pysmdev -l pl.UTF-8
-Wiązania Pythona do biblioteki libsmdev.
+Wiązania Pythona 2 do biblioteki libsmdev.
+
+%package -n python3-pysmdev
+Summary: Python 3 bindings for libsmdev library
+Summary(pl.UTF-8): Wiązania Pythona 3 do biblioteki libsmdev
+Group: Libraries/Python
+Requires: %{name} = %{version}-%{release}
+
+%description -n python3-pysmdev
+Python 3 bindings for libsmdev library.
+
+%description -n python3-pysmdev -l pl.UTF-8
+Wiązania Pythona 3 do biblioteki libsmdev.
%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
@@ -116,9 +136,12 @@ rm -rf $RPM_BUILD_ROOT
# obsoleted by pkg-config
%{__rm} $RPM_BUILD_ROOT%{_libdir}/libsmdev.la
-%if %{with python}
+%if %{with python2}
%{__rm} $RPM_BUILD_ROOT%{py_sitedir}/pysmdev.{la,a}
%endif
+%if %{with python3}
+%{__rm} $RPM_BUILD_ROOT%{py3_sitedir}/pysmdev.{la,a}
+%endif
%clean
rm -rf $RPM_BUILD_ROOT
@@ -146,8 +169,14 @@ rm -rf $RPM_BUILD_ROOT
%defattr(644,root,root,755)
%{_libdir}/libsmdev.a
-%if %{with python}
+%if %{with python2}
%files -n python-pysmdev
%defattr(644,root,root,755)
%attr(755,root,root) %{py_sitedir}/pysmdev.so
%endif
+
+%if %{with python3}
+%files -n python3-pysmdev
+%defattr(644,root,root,755)
+%attr(755,root,root) %{py3_sitedir}/pysmdev.so
+%endif
diff --git a/libsmdev-system-libs.patch b/libsmdev-system-libs.patch
deleted file mode 100644
index 4892254..0000000
--- a/libsmdev-system-libs.patch
+++ /dev/null
@@ -1,68 +0,0 @@
---- libsmdev-20150105/configure.ac.orig 2015-01-24 09:11:06.496634474
+0100
-+++ libsmdev-20150105/configure.ac 2015-01-24 09:52:25.579863770 +0100
-@@ -169,16 +169,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([libuna/Makefile])
--AC_CONFIG_FILES([libcfile/Makefile])
- AC_CONFIG_FILES([libsmdev/Makefile])
--AC_CONFIG_FILES([libcsystem/Makefile])
- AC_CONFIG_FILES([smdevtools/Makefile])
- AC_CONFIG_FILES([pysmdev/Makefile])
- AC_CONFIG_FILES([po/Makefile.in])
---- libsmdev-20150105/Makefile.am.orig 2015-01-24 09:11:06.199967820 +0100
-+++ libsmdev-20150105/Makefile.am 2015-01-24 09:52:56.293195815 +0100
-@@ -3,16 +3,7 @@ ACLOCAL_AMFLAGS = -I m4
- SUBDIRS = \
- include \
- common \
-- libcstring \
-- libcerror \
-- libcthreads \
-- libcdata \
-- libclocale \
-- libcnotify \
-- libuna \
-- libcfile \
- libsmdev \
-- libcsystem \
- smdevtools \
- pysmdev \
- po \
-@@ -65,14 +56,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)/libuna && $(MAKE) $(AM_MAKEFLAGS))
-- (cd $(srcdir)/libcfile && $(MAKE) $(AM_MAKEFLAGS))
- (cd $(srcdir)/libsmdev && $(MAKE) $(AM_MAKEFLAGS))
- (cd $(srcdir)/po && $(MAKE) $(AM_MAKEFLAGS))
-
-@@ -89,14 +72,6 @@ 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)/libclocale && $(MAKE) splint $(AM_MAKEFLAGS))
-- (cd $(srcdir)/libcdata && $(MAKE) splint $(AM_MAKEFLAGS))
-- (cd $(srcdir)/libcnotify && $(MAKE) splint $(AM_MAKEFLAGS))
-- (cd $(srcdir)/libuna && $(MAKE) splint $(AM_MAKEFLAGS))
-- (cd $(srcdir)/libcfile && $(MAKE) splint $(AM_MAKEFLAGS))
- (cd $(srcdir)/libsmdev && $(MAKE) splint $(AM_MAKEFLAGS))
- (cd $(srcdir)/smdevtools && $(MAKE) splint $(AM_MAKEFLAGS))
- (cd $(srcdir)/pysmdev && $(MAKE) splint $(AM_MAKEFLAGS))
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libsmdev.git/commitdiff/569465c4d42ab774be68ba44ab93d874e0a6446d
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
