diff --git a/Makefile.am b/Makefile.am index fc2bca01..8094b52b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -145,7 +145,8 @@ LIST_XML = doc/snapraid.xml doc/snapraid_log.xml $(patsubst %, doc/snapraid-%.xm EXTRA_DIST = \ autogen.sh autover.sh \ - README AUTHORS HISTORY INSTALL COPYING TODO CHECK INSTALL.windows \ + README AUTHORS HISTORY INSTALL TODO CHECK INSTALL.windows \ + COPYING LICENSES/GPL-2.0 LICENSES/GPL-3.0 \ $(LIST_D) \ $(LIST_MAN) \ $(LIST_TXT) \ @@ -166,7 +167,6 @@ EXTRA_DIST = \ configure.windows-x86 configure.windows-x64 snapraid.conf.example.windows \ acinclude.m4 \ tommyds/LICENSE \ - raid/COPYING \ raid/test/Makefile \ raid/test/fulltest.c \ raid/test/selftest.c \ @@ -1222,7 +1222,7 @@ distwindows-x86: $(DISTWIN) todos < README > tmp/readme.txt todos < AUTHORS > tmp/authors.txt todos < HISTORY > tmp/history.txt - todos < COPYING > tmp/copying.txt + todos < LICENSES/GPL-3.0 > tmp/copying.txt cd tmp && zip -r ../$(PACKAGE)-$(VERSION)-windows-x86.zip * rm -r tmp @@ -1235,6 +1235,6 @@ distwindows-x64: $(DISTWIN) todos < README > tmp/readme.txt todos < AUTHORS > tmp/authors.txt todos < HISTORY > tmp/history.txt - todos < COPYING > tmp/copying.txt + todos < LICENSES/GPL-3.0 > tmp/copying.txt cd tmp && zip -r ../$(PACKAGE)-$(VERSION)-windows-x64.zip * rm -r tmp diff --git a/makearch.sh.in b/makearch.sh.in index 24d7ceb4..703ab027 100644 --- a/makearch.sh.in +++ b/makearch.sh.in @@ -50,7 +50,8 @@ make install DESTDIR="../${PKG_ROOT}" # Add example config and docs mkdir -p "../${PKG_ROOT}/usr/share/doc/@PACKAGE@" -cp @PACKAGE@.conf.example COPYING AUTHORS HISTORY README "../${PKG_ROOT}/usr/share/doc/@PACKAGE@/" +cp @PACKAGE@.conf.example AUTHORS HISTORY README "../${PKG_ROOT}/usr/share/doc/@PACKAGE@/" +cp LICENSES/GPL-3.0 "../${PKG_ROOT}/usr/share/doc/@PACKAGE@/COPYING" cd .. @@ -67,7 +68,7 @@ cd ${PKG_ROOT} echo "Create .MTREE" bsdtar -czf .MTREE --format=mtree --options='!all,use-set,type,uid,gid,mode,time,size,md5,sha256,link' .PKGINFO usr -# Build the .deb package +# Build the .pkg package echo "Building .PKG package..." tar --owner=0 --group=0 -cvf - .PKGINFO .MTREE usr | zstd -c -z -q - > ../${PKG_NAME}-${VERSION}-1-x86_64.pkg.tar.zst diff --git a/makedeb.sh.in b/makedeb.sh.in index 1a056689..82760a01 100644 --- a/makedeb.sh.in +++ b/makedeb.sh.in @@ -47,7 +47,8 @@ make install DESTDIR="../${PKG_ROOT}" # Add example config and docs mkdir -p "../${PKG_ROOT}/usr/share/doc/@PACKAGE@" -cp @PACKAGE@.conf.example COPYING AUTHORS HISTORY README "../${PKG_ROOT}/usr/share/doc/@PACKAGE@/" +cp @PACKAGE@.conf.example AUTHORS HISTORY README "../${PKG_ROOT}/usr/share/doc/@PACKAGE@/" +cp LICENSES/GPL-3.0 "../${PKG_ROOT}/usr/share/doc/@PACKAGE@/COPYING" cd .. diff --git a/pkg/PKGBUILD.in b/pkg/PKGBUILD.in index 1d106ee3..7ea5e8d8 100644 --- a/pkg/PKGBUILD.in +++ b/pkg/PKGBUILD.in @@ -26,5 +26,5 @@ package() { install -Dm644 snapraid.conf.example "$pkgdir/usr/share/doc/$pkgname/snapraid.conf.example" # Arch Policy: License must also be in the license directory - install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/COPYING" + install -Dm644 LICENSES/GPL-3.0 "$pkgdir/usr/share/licenses/$pkgname/COPYING" } diff --git a/pkg/snapraid.SlackBuild.in b/pkg/snapraid.SlackBuild.in index 3b89dc72..cf6b87d2 100644 --- a/pkg/snapraid.SlackBuild.in +++ b/pkg/snapraid.SlackBuild.in @@ -99,8 +99,9 @@ for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; r mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a \ - COPYING AUTHORS HISTORY README snapraid.conf.example \ + AUTHORS HISTORY README snapraid.conf.example \ $PKG/usr/doc/$PRGNAM-$VERSION +cp -a LICENSES/GPL-3.0 $PKG/usr/doc/$PRGNAM-$VERSION/COPYING cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild mkdir -p $PKG/install diff --git a/pkg/snapraid.spec.in b/pkg/snapraid.spec.in index b843b5ec..da1a53b7 100644 --- a/pkg/snapraid.spec.in +++ b/pkg/snapraid.spec.in @@ -29,7 +29,7 @@ rm -rf %{buildroot} make install DESTDIR=%{buildroot} %files -%license COPYING +%license LICENSES/GPL-3.0 %doc AUTHORS HISTORY README @PACKAGE@.conf.example %{_bindir}/@PACKAGE@ %{_mandir}/man1/@PACKAGE@.1*