Update Linux packaging

diff --git a/archlinux/PKGBUILD b/archlinux/PKGBUILD
index 8157966ab99fd1bce49a1f7c07dc6904fed98873..027ca1c69fbe1e0191c8d0599de02845d7014030 100644 (file)
--- a/archlinux/PKGBUILD
+++ b/archlinux/PKGBUILD
@@ -6,7 +6,7 @@ pkgrel=1
 pkgdesc="A library and program to extract, create, and modify WIM files"
 arch=("i686" "x86_64")
 url="http://sourceforge.net/projects/wimlib"
 pkgdesc="A library and program to extract, create, and modify WIM files"
 arch=("i686" "x86_64")
 url="http://sourceforge.net/projects/wimlib"

-license=("GPL3")
+license=("custom")

 depends=("openssl" "fuse" "libxml2" "ntfs-3g" "attr")
 optdepends=("cdrkit: for making ISO image of Windows PE"
        "mtools: for making disk image of Windows PE"
 depends=("openssl" "fuse" "libxml2" "ntfs-3g" "attr")
 optdepends=("cdrkit: for making ISO image of Windows PE"
        "mtools: for making disk image of Windows PE"


@@ -30,7 +30,10 @@ check() {
 package() {
        cd "$pkgname-$pkgver"
        make DESTDIR="$pkgdir" install
 package() {
        cd "$pkgname-$pkgver"
        make DESTDIR="$pkgdir" install

-       for file in README NEWS README.WINDOWS; do
+       for file in NEWS README*; do

                install -Dm644 $file "$pkgdir/usr/share/doc/$pkgname/$file"
        done
                install -Dm644 $file "$pkgdir/usr/share/doc/$pkgname/$file"
        done

+       for file in COPYING*; do
+               install -Dm644 $file "$pkgdir/usr/share/licenses/$pkgname/$file"
+       done

 }
 }

diff --git a/debian/wimlib-doc.docs b/debian/wimlib-doc.docs
index a6af802829a3a8003570da4e07dd3429764c6bb7..3abb624d2dfb3cfacb3ef694e23c7fcbbe35fffb 100644 (file)
--- a/debian/wimlib-doc.docs
+++ b/debian/wimlib-doc.docs
@@ -1,4 +1,3 @@
 doc/html
 doc/html

-AUTHORS

 NEWS
 README
 NEWS
 README

diff --git a/debian/wimtools.docs b/debian/wimtools.docs
index 6f83607c14aa1cd7cb72686f7cda5ddd090b09ae..50bd824bb7bc7edba72e31d1f7a6ef7932846902 100644 (file)
--- a/debian/wimtools.docs
+++ b/debian/wimtools.docs
@@ -1,3 +1,2 @@
-AUTHORS

 NEWS
 README
 NEWS
 README

diff --git a/rpm/wimtools.spec b/rpm/wimtools.spec
index cc2ad433d0500b59b44ea23ff7b3f6a0f915598f..64bae856dcf5dd73d1e727e6ab95f337eeb5d9b5 100644 (file)
--- a/rpm/wimtools.spec
+++ b/rpm/wimtools.spec
@@ -76,7 +76,7 @@ rm -rf %{buildroot}
 %defattr(-, root, root)
 %{_bindir}/*
 %doc %{_mandir}/man1/*.1.gz
 %defattr(-, root, root)
 %{_bindir}/*
 %doc %{_mandir}/man1/*.1.gz

-%doc README AUTHORS COPYING
+%doc README COPYING COPYING.GPLv3

 
 %files -n libwim15-devel
 %defattr(-, root, root)
 
 %files -n libwim15-devel
 %defattr(-, root, root)


@@ -89,4 +89,4 @@ rm -rf %{buildroot}
 %files -n libwim15
 %defattr(-, root, root)
 %{_libdir}/libwim.so.*
 %files -n libwim15
 %defattr(-, root, root)
 %{_libdir}/libwim.so.*

-%doc COPYING
+%doc COPYING COPYING.GPLv3 COPYING.LGPLv3