rpm/wimtools.spec: update

diff --git a/rpm/wimtools.spec b/rpm/wimtools.spec
index d457f9a5071644760af0903080d7aff517d73007..5032490cfa101add7b5184d18a9274b44b2db9cf 100644 (file)
--- a/rpm/wimtools.spec
+++ b/rpm/wimtools.spec
@@ -1,5 +1,5 @@
-Summary:   Library to extract, create, modify, and mount WIM files

 Name:      wimtools
 Name:      wimtools

+Summary:   Tools to create, extract, modify, and mount WIM files

 Version:   1.5.0
 Release:   1
 License:   GPLv3+
 Version:   1.5.0
 Release:   1
 License:   GPLv3+


@@ -8,13 +8,8 @@ Packager:  Eric Biggers <ebiggers3@gmail.com>
 Source:    http://downloads.sourceforge.net/wimlib/wimlib-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 
 Source:    http://downloads.sourceforge.net/wimlib/wimlib-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
 

-Requires: libxml2, libfuse2, fuse, openssl
-Requires: ntfs-3g
-BuildRequires: libxml2-devel, fuse, fuse-devel, openssl-devel, libattr-devel
-BuildRequires: ntfs-3g-devel, ntfsprogs, libtool, pkg-config

 
 

-Summary: Tools to create, extract, modify, and mount WIM files
-Group:    Applications/System
+Group:  Applications/System

 Requires: libwim9
 %description
 Tools to extract, create, modify, and mount WIM (Windows Imaging) files.  WIM is
 Requires: libwim9
 %description
 Tools to extract, create, modify, and mount WIM (Windows Imaging) files.  WIM is


@@ -23,7 +18,7 @@ features single-instancing and LZ77-based compression and is used by Microsoft
 to distribute and deploy Windows Vista and later.  WIM files are normally
 created by using the `imagex.exe' utility on Windows, but this package contains
 a free implementation of ImageX called "wimlib-imagex" that is designed to work
 to distribute and deploy Windows Vista and later.  WIM files are normally
 created by using the `imagex.exe' utility on Windows, but this package contains
 a free implementation of ImageX called "wimlib-imagex" that is designed to work

-on both UNIX and Windows.
+on both UNIX-like systems and Windows.

 
 In addition to the usual extract/create/update support, wimlib-imagex allows you
 to mount WIM images readonly or read-write, and it even allows you to extract or
 
 In addition to the usual extract/create/update support, wimlib-imagex allows you
 to mount WIM images readonly or read-write, and it even allows you to extract or


@@ -34,25 +29,28 @@ WIM file, such as the install.wim distributed on the Windows installation media.
 This package also contains a script to make a customized Windows PE image based
 on the capabilities provided by wimlib-imagex.
 
 This package also contains a script to make a customized Windows PE image based
 on the capabilities provided by wimlib-imagex.
 

-%package devel
+%package -n libwim9-devel

 Summary:  Development files for wimlib
 Summary:  Development files for wimlib

-Group:     System/Libraries
-%description devel
+Group:  Development/Libraries
+%description -n libwim9-devel

 Development files for wimlib
 
 %package -n libwim9
 Development files for wimlib
 
 %package -n libwim9

-Summary:   Library to extract, create, modify, and mount WIM files
-Group:    Development/Libraries
+Summary:  Library to extract, create, modify, and mount WIM files
+Group:  System Environment/Libraries
+Requires:  fuse
+BuildRequires: libxml2-devel, fuse, fuse-devel, openssl-devel, libattr-devel
+BuildRequires: ntfs-3g-devel, ntfsprogs, libtool, pkgconfig

 %description -n libwim9
 wimlib is a C library for extracting, creating, modifying, and mounting WIM
 (Windows Imaging) files.  WIM is an archive format designed primarily for
 archiving Windows filesystems.  It features single-instancing and LZ77-based
 compression, and is used by Microsoft to distribute and deploy Windows Vista and
 later.  wimlib is an independent implementation of an API for handling WIM
 %description -n libwim9
 wimlib is a C library for extracting, creating, modifying, and mounting WIM
 (Windows Imaging) files.  WIM is an archive format designed primarily for
 archiving Windows filesystems.  It features single-instancing and LZ77-based
 compression, and is used by Microsoft to distribute and deploy Windows Vista and
 later.  wimlib is an independent implementation of an API for handling WIM

-files, available on both UNIX and Windows, that provides features similar to
-Microsoft's WIMGAPI, as well as additional features such as support for pipable
-WIM files and programatically making changes to WIM images without mounting
-them.
+files, available on both UNIX-like systems and Windows, that provides features
+similar to Microsoft's WIMGAPI, as well as additional features such as support
+for pipable WIM files and programatically making changes to WIM images without
+mounting them.

 %post -n libwim9 -p /sbin/ldconfig
 %postun -n libwim9 -p /sbin/ldconfig
 
 %post -n libwim9 -p /sbin/ldconfig
 %postun -n libwim9 -p /sbin/ldconfig
 


@@ -60,7 +58,6 @@ them.
 %setup -q -n wimlib-%{version}
 
 %build
 %setup -q -n wimlib-%{version}
 
 %build

-autoreconf -i -f

 %configure --prefix=/usr               \
            --disable-rpath             \
           --with-libcrypto             \
 %configure --prefix=/usr               \
            --disable-rpath             \
           --with-libcrypto             \


@@ -76,23 +73,21 @@ make DESTDIR=%{buildroot} install
 %clean
 rm -rf %{buildroot}
 
 %clean
 rm -rf %{buildroot}
 

-

 %files
 %defattr(-, root, root)
 %{_bindir}/*
 %doc %{_mandir}/man1/*.1.gz
 %files
 %defattr(-, root, root)
 %{_bindir}/*
 %doc %{_mandir}/man1/*.1.gz

-%doc %{_mandir}/man1/*.1
+%doc README AUTHORS COPYING

 
 

-%files devel
+%files -n libwim9-devel

 %defattr(-, root, root)
 %{_libdir}/libwim.a
 %{_libdir}/libwim.so
 %exclude %{_libdir}/libwim.la
 %{_includedir}/wimlib.h
 %{_libdir}/pkgconfig/wimlib.pc
 %defattr(-, root, root)
 %{_libdir}/libwim.a
 %{_libdir}/libwim.so
 %exclude %{_libdir}/libwim.la
 %{_includedir}/wimlib.h
 %{_libdir}/pkgconfig/wimlib.pc

-%doc AUTHORS COPYING README

 
 %files -n libwim9
 %defattr(-, root, root)
 %{_libdir}/libwim.so.*
 
 %files -n libwim9
 %defattr(-, root, root)
 %{_libdir}/libwim.so.*

-
+%doc COPYING