Skip to content

Commit

Permalink
misc fixes
Browse files Browse the repository at this point in the history
 - fix for #2038
 - update RELNOTES
 - fix #2925
  • Loading branch information
rusty-snake authored and rusty-snake committed Aug 26, 2019
1 parent 2373fcd commit 282bab5
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 3 deletions.
1 change: 1 addition & 0 deletions Makefile.in
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
5 changes: 3 additions & 2 deletions RELNOTES
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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 <[email protected]> Sat, 1 Jun 2019 08:00:00 -0500

firejail (0.9.60) baseline; urgency=low
Expand Down
2 changes: 1 addition & 1 deletion platform/rpm/mkrpm.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down

0 comments on commit 282bab5

Please sign in to comment.