From 282bab5ced6aececc4f999acf3c077887a47f341 Mon Sep 17 00:00:00 2001
From: rusty-snake <print_hello_world+Public@protonmail.com>
Date: Mon, 26 Aug 2019 09:23:04 +0200
Subject: misc fixes

 - fix for #2038
 - update RELNOTES
 - fix #2925
---
 Makefile.in           | 1 +
 RELNOTES              | 5 +++--
 platform/rpm/mkrpm.sh | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index ebfbac318..44137c0bc 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -193,6 +193,7 @@ uninstall:
 	rm -f $(DESTDIR)/$(datarootdir)/bash-completion/completions/firejail
 	rm -f $(DESTDIR)/$(datarootdir)/bash-completion/completions/firemon
 	rm -f $(DESTDIR)/$(datarootdir)/bash-completion/completions/firecfg
+	@echo "If you want to install a different version of firejail, you might also need to run 'rm -fr $(DESTDIR)/$(sysconfdir)/firejail', see #2038."
 
 DISTFILES = "src etc platform contrib configure configure.ac dummy.c Makefile.in install.sh mkman.sh mketc.sh mkdeb.sh mkdeb-apparmor.sh COPYING README RELNOTES"
 DISTFILES_TEST = "test/apps test/apps-x11 test/apps-x11-xorg test/root test/fcopy test/environment test/profiles test/utils test/compile test/filters test/network test/arguments test/fs test/sysutils test/chroot"
diff --git a/RELNOTES b/RELNOTES
index 41a288bd0..a50f40926 100644
--- a/RELNOTES
+++ b/RELNOTES
@@ -1,7 +1,7 @@
 firejail (0.9.61) baseline; urgency=low
   * work in progress
   * added file-copy-limit in /etc/firejail/firejail.config
-  * profile templates
+  * profile templates (/usr/share/doc/firejail)
   * allow-debuggers support in profiles
   * new scripts in conrib: gdb-firejail.sh and sort.py
   * new profiles: qgis, klatexformula, klatexformula_cmdl, links, xlinks
@@ -13,7 +13,8 @@ firejail (0.9.61) baseline; urgency=low
   * new profiles: mpg123-portaudio, mpg123-pulse, mpg123-strip, pavucontrol-qt
   * new profiles: gnome-characters, gnome-character-map, rsync, Whalebird,
   * new profiles: tor-browser (AUR), Zulip, tb-starter-wrapper, bzcat,
-  * new profiles: kiwix-desktop
+  * new profiles: kiwix-desktop, bzcat, zstd, pzstd, zstdcat, zstdgrep, zstdless
+  * new profiles: zstdmt, unzstd, i2p
  -- netblue30 <netblue30@yahoo.com>  Sat, 1 Jun 2019 08:00:00 -0500
 
 firejail (0.9.60) baseline; urgency=low
diff --git a/platform/rpm/mkrpm.sh b/platform/rpm/mkrpm.sh
index b63340e43..351b92beb 100755
--- a/platform/rpm/mkrpm.sh
+++ b/platform/rpm/mkrpm.sh
@@ -33,7 +33,7 @@ sed -e "s/__NAME__/${name}/g" -e "s/__VERSION__/${version}/g" platform/rpm/${nam
 # FIXME: We could parse RELNOTES and create a %changelog section here
 
 # Copy the source to build into a tarball
-tar czf ${tmpdir}/SOURCES/${name}-${version}.tar.gz . --transform "s/^./${name}-${version}/" --exclude='./.git*' --exclude='./test*'
+tar --exclude='./.git*' --exclude='./test' --transform "s/^./${name}-${version}/" -czf ${tmpdir}/SOURCES/${name}-${version}.tar.gz .
 
 # Build the files (rpm, debug rpm and source rpm)
 rpmbuild --quiet --define "_topdir ${tmpdir}" -ba ${tmp_spec_file}
-- 
cgit v1.2.3-54-g00ecf