wimlib.spec.in: Another update

[wimlib] / rpm / wimlib.spec.in

diff --git a/rpm/wimlib.spec.in b/rpm/wimlib.spec.in
index 4140c5ec1f5330e45a37e98cba4706bcce6300f9..a194e92746a781e7ed506b36283e50ab249981b9 100644 (file)
--- a/rpm/wimlib.spec.in
+++ b/rpm/wimlib.spec.in
@@ -1,15 +1,18 @@
-Summary:  Library to extract, create, and modify WIM files
-Name: wimlib
-Version: @VERSION@
-Release: 1
-License: LGPL
-Group: System Environment/Libraries
-Packager: Eric Biggers (ebiggers3@gmail.com)
-URL:  http://wimlib.sourceforge.net
-Source: http://downloads.sourceforge.net/wimlib/wimlib-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}/wimlib-root
-BuildRequires:  libxml2-devel fuse-devel openssl-devel
-Requires:  libxml2 fuse-libs openssl
+Summary:   Library to extract, create, and modify WIM files
+Name:      wimlib
+Version:   @VERSION@
+Release:   1
+License:   GPLv3+
+Group:     System/Libraries
+URL:       http://wimlib.sourceforge.net
+Packager:  Eric Biggers <ebiggers3@gmail.com>
+Source:    http://downloads.sourceforge.net/wimlib/wimlib-%{version}.tar.gz
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+
+Requires: libxml2, fuse-libs, fuse, openssl
+Requires: ntfs-3g >= 2:2011.4.12
+BuildRequires: libxml2-devel, fuse-devel, openssl-devel, libattr-devel
+BuildRequires: ntfs-3g-devel >= 2:2011.4.12, ntfsprogs
 %description
 wimlib is a library that can be used to create, extract, and modify files in the
 Windows Imaging Format. These files are normally created by the 'imagex.exe'
@@ -18,39 +21,50 @@ for UNIX-based systems. wimlib supports mounting WIM files, just like
 imagex.exe.
 
 %package devel
-Summary: Development files for wimlib
-Group: Development/Libraries
+Summary:  Development files for wimlib
+Group:    Development/Libraries
 Requires: %{name} = %{version}-%{release}
 %description devel
 Development files for wimlib
 
 %prep
-%setup -q
+%setup -q -n %{name}-${version}
 
 %build
-./configure --disable-verify-compression --enable-libcrypto  --prefix=/usr
-make
+%configure --prefix=/usr                 \
+           --disable-rpath               \
+          --with-libcrypto              \
+          --with-ntfs-3g                \
+          --enable-xattr                \
+           --disable-verify-compression
+%__make %{?_smp_mflags}
+
+%check
+make check
 
 %install
-rm -rf $RPM_BUILD_ROOT
-%makeinstall
+%__rm -rf ${buildroot}
+%__make DESTDIR=${buildroot} install
+
+%clean
+%__rm -rf ${buildroot}
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files
 %defattr(-, root, root)
+%doc AUTHORS COPYING README TODO
 %{_bindir}/imagex
 %{_bindir}/mkwinpeimg
-%{_libdir}/libwim.so*
+%{_libdir}/libwim.so
+%{_libdir}/libwim.so.0
+%{_libdir}/libwim.so.0.0.0
 %doc %{_mandir}/man1/*.1.gz
 
 %files devel
 %defattr(-, root, root)
-%{_libdir}/*.a
-%{_libdir}/*.la
-%{_includedir}/*.h
+%{_libdir}/libwim.a
+%{_libdir}/libwim.la
+%{_includedir}/wimlib.h
 %{_libdir}/pkgconfig/wimlib.pc