commit f6e25d9f0b24ab903927afe76dee462a1a9445f1
Author: Jakub Bogusz <[email protected]>
Date: Thu Jul 18 16:17:47 2019 +0200
- updated to 20181227 (alpha)
- removed obsolete system-libs patch
libfwnt-system-libs.patch | 52 ---------------------------
libfwnt.spec | 92 ++++++++++++++++++++++++++++++++++++-----------
2 files changed, 71 insertions(+), 73 deletions(-)
---
diff --git a/libfwnt.spec b/libfwnt.spec
index 04c8354..fb79958 100644
--- a/libfwnt.spec
+++ b/libfwnt.spec
@@ -1,30 +1,37 @@
+# see m4/${libname}.m4 />= for required version of particular library
+%define libcdata_ver 20181216
+%define libcerror_ver 20120425
+%define libcnotify_ver 20120425
+%define libcthreads_ver 20160404
Summary: Library to support Windows NT specific formats
Summary(pl.UTF-8): Biblioteka wspierająca formaty specyficzne dla Windows
NT
Name: libfwnt
-Version: 20150104
-Release: 2
+Version: 20181227
+Release: 1
License: LGPL v3+
Group: Libraries
-Source0:
https://github.com/libyal/libfwnt/archive/%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: eb83116fd3a8eb9205be1c06049dec67
-Patch0: %{name}-system-libs.patch
+#Source0Download: https://github.com/libyal/libfwnt/releases
+Source0:
https://github.com/libyal/libfwnt/releases/download/%{version}/%{name}-alpha-%{version}.tar.gz
+# Source0-md5: 4af5a64b1603ef19c22c2a90162cf114
URL: https://github.com/libyal/libfwnt/
BuildRequires: autoconf >= 2.59
BuildRequires: automake >= 1.6
BuildRequires: gettext-tools >= 0.18.1
-BuildRequires: libcdata-devel >= 20150102
-BuildRequires: libcerror-devel >= 20120425
-BuildRequires: libcnotify-devel >= 20120425
+BuildRequires: libcdata-devel >= %{libcdata_ver}
+BuildRequires: libcerror-devel >= %{libcerror_ver}
+BuildRequires: libcnotify-devel >= %{libcnotify_ver}
BuildRequires: libcstring-devel >= 20120425
-BuildRequires: libcthreads-devel >= 20130509
+BuildRequires: libcthreads-devel >= %{libcthreads_ver}
BuildRequires: libtool
BuildRequires: pkgconfig
-BuildRequires: sed >= 4.0
-Requires: libcdata >= 20150102
-Requires: libcerror >= 20120425
-Requires: libcnotify >= 20120425
+%{?with_python2:BuildRequires: python-devel >= 2}
+%{?with_python3:BuildRequires: python3-devel >= 1:3.2}
+BuildRequires: rpm-pythonprov
+Requires: libcdata >= %{libcdata_ver}
+Requires: libcerror >= %{libcerror_ver}
+Requires: libcnotify >= %{libcnotify_ver}
Requires: libcstring >= 20120425
-Requires: libcthreads >= 20130509
+Requires: libcthreads >= %{libcthreads_ver}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -38,11 +45,11 @@ Summary: Header files for libfwnt library
Summary(pl.UTF-8): Pliki nagłówkowe biblioteki libfwnt
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
-Requires: libcdata-devel >= 20150102
-Requires: libcerror-devel >= 20120425
-Requires: libcnotify-devel >= 20120425
+Requires: libcdata-devel >= %{libcdata_ver}
+Requires: libcerror-devel >= %{libcerror_ver}
+Requires: libcnotify-devel >= %{libcnotify_ver}
Requires: libcstring-devel >= 20120425
-Requires: libcthreads-devel >= 20130509
+Requires: libcthreads-devel >= %{libcthreads_ver}
%description devel
Header files for libfwnt library.
@@ -62,19 +69,43 @@ Static libfwnt library.
%description static -l pl.UTF-8
Statyczna biblioteka libfwnt.
+%package -n python-pyfwnt
+Summary: Python 2 interface to libfwnt
+Summary(pl.UTF-8): Interfejs Pythona 2 do libfwnt
+Group: Libraries/Python
+Requires: %{name} = %{version}-%{release}
+
+%description -n python-pyfwnt
+Python 2 interface to libfwnt.
+
+%description -n python-pyfwnt -l pl.UTF-8
+Interfejs Pythona 2 do libfwnt.
+
+%package -n python3-pyfwnt
+Summary: Python 3 interface to libfwnt
+Summary(pl.UTF-8): Interfejs Pythona 3 do libfwnt
+Group: Libraries/Python
+Requires: %{name} = %{version}-%{release}
+
+%description -n python3-pyfwnt
+Python 3 interface to libfwnt.
+
+%description -n python3-pyfwnt -l pl.UTF-8
+Interfejs Pythona 3 do libfwnt.
+
%prep
%setup -q
-%patch0 -p1
%build
%{__gettextize}
-%{__sed} -i -e 's/ po\/Makefile.in//' configure.ac
%{__libtoolize}
%{__aclocal} -I m4
%{__autoconf}
%{__autoheader}
%{__automake}
-%configure
+%configure \
+ %{?with_python2:--enable-python2} \
+ %{?with_python3:--enable-python3}
%{__make}
%install
@@ -86,6 +117,13 @@ rm -rf $RPM_BUILD_ROOT
# obsoleted by pkg-config
%{__rm} $RPM_BUILD_ROOT%{_libdir}/libfwnt.la
+%if %{with python2}
+%{__rm} $RPM_BUILD_ROOT%{py_sitedir}/pyfwnt.{la,a}
+%endif
+%if %{with python3}
+%{__rm} $RPM_BUILD_ROOT%{py3_sitedir}/pyfwnt.{la,a}
+%endif
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -109,3 +147,15 @@ rm -rf $RPM_BUILD_ROOT
%files static
%defattr(644,root,root,755)
%{_libdir}/libfwnt.a
+
+%if %{with python2}
+%files -n python-pyfwnt
+%defattr(644,root,root,755)
+%attr(755,root,root) %{py_sitedir}/pyfwnt.so
+%endif
+
+%if %{with python3}
+%files -n python3-pyfwnt
+%defattr(644,root,root,755)
+%attr(755,root,root) %{py3_sitedir}/pyfwnt.so
+%endif
diff --git a/libfwnt-system-libs.patch b/libfwnt-system-libs.patch
deleted file mode 100644
index 049e279..0000000
--- a/libfwnt-system-libs.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- libfwnt-20150104/configure.ac.orig 2015-01-22 20:37:14.988825192 +0100
-+++ libfwnt-20150104/configure.ac 2015-01-22 20:38:40.175488283 +0100
-@@ -136,11 +136,6 @@ 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([libcnotify/Makefile])
- AC_CONFIG_FILES([libfwnt/Makefile])
- AC_CONFIG_FILES([po/Makefile.in])
- AC_CONFIG_FILES([po/Makevars])
---- libfwnt-20150104/Makefile.am.orig 2015-01-22 20:37:14.485491880 +0100
-+++ libfwnt-20150104/Makefile.am 2015-01-22 20:38:55.805487628 +0100
-@@ -3,11 +3,6 @@ ACLOCAL_AMFLAGS = -I m4
- SUBDIRS = \
- include \
- common \
-- libcstring \
-- libcerror \
-- libcthreads \
-- libcdata \
-- libcnotify \
- libfwnt \
- po \
- manuals \
-@@ -58,11 +53,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)/libcnotify && $(MAKE) $(AM_MAKEFLAGS))
- (cd $(srcdir)/libfwnt && $(MAKE) $(AM_MAKEFLAGS))
- (cd $(srcdir)/po && $(MAKE) $(AM_MAKEFLAGS))
-
-@@ -79,11 +69,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)/libcdata && $(MAKE) splint $(AM_MAKEFLAGS))
-- (cd $(srcdir)/libcnotify && $(MAKE) splint $(AM_MAKEFLAGS))
- (cd $(srcdir)/libfwnt && $(MAKE) splint $(AM_MAKEFLAGS))
- (cd $(srcdir)/po && $(MAKE) splint $(AM_MAKEFLAGS))
- (cd $(srcdir)/tests && $(MAKE) splint $(AM_MAKEFLAGS))
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libfwnt.git/commitdiff/f6e25d9f0b24ab903927afe76dee462a1a9445f1
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
