diff --git a/hxtools.spec b/hxtools.spec index e70b0eb..42d666f 100644 --- a/hxtools.spec +++ b/hxtools.spec @@ -1,20 +1,17 @@ Name: hxtools -Version: 20120514 -Release: 3%{?dist} +Version: 20130605 +Release: 1%{?dist} Summary: A collection of several tools - -Group: Applications/System # fd0ssh: LGPLv2 or LGPLv3 +# git-forest: GPLv2+ # ofl: Public Domain, but LGPVv2 or LPGLv3 because of linking with libHX -License: LGPLv2 or LGPLv3 +License: GPLv2+ or LGPLv2 or LGPLv3 URL: http://inai.de/projects/hxtools/ Source0: http://inai.de/files/hxtools/hxtools-%{version}.tar.xz -Source1: http://inai.de/files/hxtools/hxtools-%{version}.tar.xz.asc +Source1: http://inai.de/files/hxtools/hxtools-%{version}.tar.asc BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: libHX-devel -# for ./autogen.sh / autoreconf -BuildRequires: automake # for sys/capability.h in printcaps.c BuildRequires: libcap-devel # for libmount.h in suser/sysinfo.c @@ -35,7 +32,6 @@ Currently only tools needed for pam_mount are included in this package. %build -./autogen.sh %configure make %{?_smp_mflags} V=1 @@ -51,6 +47,7 @@ make install DESTDIR=$RPM_BUILD_ROOT #rm "$RPM_BUILD_ROOT%%{_libexecdir}/hxtools/proc_iomem_count" #rm "$RPM_BUILD_ROOT%%{_datadir}/rfc2307bis-utf8.schema" #rm "$RPM_BUILD_ROOT%%{_mandir}/man8/xfs_irecover.8"* +rm "$RPM_BUILD_ROOT/%{_bindir}/hcdplay" rm "$RPM_BUILD_ROOT/%{_sysconfdir}/hxloginpref.conf" rm "$RPM_BUILD_ROOT/%{_bindir}/checkbrack" rm "$RPM_BUILD_ROOT/%{_bindir}/clock_info" @@ -60,7 +57,6 @@ rm "$RPM_BUILD_ROOT/%{_bindir}/fduphl" rm "$RPM_BUILD_ROOT/%{_bindir}/fxterm" rm "$RPM_BUILD_ROOT/%{_bindir}/git-author-stat" rm "$RPM_BUILD_ROOT/%{_bindir}/git-export-patch" -rm "$RPM_BUILD_ROOT/%{_bindir}/git-forest" rm "$RPM_BUILD_ROOT/%{_bindir}/git-track" rm "$RPM_BUILD_ROOT/%{_bindir}/googtts" rm "$RPM_BUILD_ROOT/%{_bindir}/gpsh" @@ -97,6 +93,7 @@ rm "$RPM_BUILD_ROOT/%{_libexecdir}/hxtools/mod2ogg" rm "$RPM_BUILD_ROOT/%{_libexecdir}/hxtools/mpg2ogg" rm "$RPM_BUILD_ROOT/%{_libexecdir}/hxtools/netload" rm "$RPM_BUILD_ROOT/%{_libexecdir}/hxtools/paddrspacesize" +rm "$RPM_BUILD_ROOT/%{_libexecdir}/hxtools/pcmdiff" rm "$RPM_BUILD_ROOT/%{_libexecdir}/hxtools/png2wx.pl" rm "$RPM_BUILD_ROOT/%{_libexecdir}/hxtools/png2wx.py" rm "$RPM_BUILD_ROOT/%{_libexecdir}/hxtools/printcaps" @@ -111,33 +108,33 @@ rm "$RPM_BUILD_ROOT/%{_libexecdir}/hxtools/stxdb" rm "$RPM_BUILD_ROOT/%{_libexecdir}/hxtools/utmp_register" rm "$RPM_BUILD_ROOT/%{_libexecdir}/hxtools/vcsaview" rm "$RPM_BUILD_ROOT/%{_libexecdir}/hxtools/vfontas" -rm "$RPM_BUILD_ROOT/%{_libexecdir}/hxtools/wavdiff" rm "$RPM_BUILD_ROOT/%{_libexecdir}/hxtools/proc_stat_parse" -rm "$RPM_BUILD_ROOT/%{_datadir}/gitconfig" -rm "$RPM_BUILD_ROOT/%{_datadir}/hxloginpref.conf" -rm "$RPM_BUILD_ROOT/%{_datadir}/hxtools/kbd/ahnv.fnt" -rm "$RPM_BUILD_ROOT/%{_datadir}/hxtools/kbd/ati.fnt" -rm "$RPM_BUILD_ROOT/%{_datadir}/hxtools/kbd/ega437_8x14.fnt" -rm "$RPM_BUILD_ROOT/%{_datadir}/hxtools/kbd/ega437_8x16.fnt" -rm "$RPM_BUILD_ROOT/%{_datadir}/hxtools/kbd/ega437_8x8.fnt" -rm "$RPM_BUILD_ROOT/%{_datadir}/hxtools/kbd/gotik-textura.fnt" -rm "$RPM_BUILD_ROOT/%{_datadir}/hxtools/kbd/i386/qwerty/us_jng.map" -rm "$RPM_BUILD_ROOT/%{_datadir}/hxtools/kbd/i386/qwerty/us_jng_vaiou3.map" -rm "$RPM_BUILD_ROOT/%{_datadir}/hxtools/kbd/i386/qwertz/de_jng.map" -rm "$RPM_BUILD_ROOT/%{_datadir}/hxtools/kbd/ital.fnt" -rm "$RPM_BUILD_ROOT/%{_datadir}/hxtools/kbd/misc/ahnv.pcf.gz" -rm "$RPM_BUILD_ROOT/%{_datadir}/hxtools/kbd/misc/mux.pcf.gz" -rm "$RPM_BUILD_ROOT/%{_datadir}/hxtools/kbd/misc/rhx.pcf.gz" -rm "$RPM_BUILD_ROOT/%{_datadir}/hxtools/kbd/misc/tosh.pcf.gz" -rm "$RPM_BUILD_ROOT/%{_datadir}/hxtools/kbd/mux.fnt" -rm "$RPM_BUILD_ROOT/%{_datadir}/hxtools/kbd/neuropol.fnt" -rm "$RPM_BUILD_ROOT/%{_datadir}/hxtools/kbd/nvidia.fnt" -rm "$RPM_BUILD_ROOT/%{_datadir}/hxtools/kbd/rhx.fnt" -rm "$RPM_BUILD_ROOT/%{_datadir}/hxtools/kbd/tosh.fnt" -rm "$RPM_BUILD_ROOT/%{_datadir}/hxtools_bashrc.bash" -rm "$RPM_BUILD_ROOT/%{_datadir}/hxtools_dircolors" -rm "$RPM_BUILD_ROOT/%{_datadir}/hxtools_profile.bash" -rm "$RPM_BUILD_ROOT/%{_datadir}/rfc2307bis-utf8.schema" +rm "$RPM_BUILD_ROOT/%{_datadir}/hxtools/gitconfig" +rm "$RPM_BUILD_ROOT/%{_datadir}/hxtools/hxloginpref.conf" +rm "$RPM_BUILD_ROOT/%{_datadir}/kbd/consolefonts/ega437_8x14.fnt" +rm "$RPM_BUILD_ROOT/%{_datadir}/kbd/consolefonts/ega437_8x16.fnt" +rm "$RPM_BUILD_ROOT/%{_datadir}/kbd/consolefonts/ega437_8x8.fnt" +rm "$RPM_BUILD_ROOT/%{_datadir}/kbd/consolefonts/gotik-textura.fnt" +rm "$RPM_BUILD_ROOT/%{_datadir}/kbd/keymaps/i386/qwerty/us_jng.map" +rm "$RPM_BUILD_ROOT/%{_datadir}/kbd/keymaps/i386/qwerty/us_jng_vaiou3.map" +rm "$RPM_BUILD_ROOT/%{_datadir}/kbd/keymaps/i386/qwertz/de_jng.map" +rm "$RPM_BUILD_ROOT/%{_datadir}/kbd/unimaps/cp437AB.uni" +rm "$RPM_BUILD_ROOT/%{_datadir}/kbd/consolefonts/ital.fnt" +rm "$RPM_BUILD_ROOT/%{_datadir}/fonts/misc/mux.pcf.gz" +rm "$RPM_BUILD_ROOT/%{_datadir}/fonts/misc/rhx.pcf.gz" +rm "$RPM_BUILD_ROOT/%{_datadir}/fonts/misc/tosh.pcf.gz" +rm "$RPM_BUILD_ROOT/%{_datadir}/kbd/consolefonts/A1.fnt" +rm "$RPM_BUILD_ROOT/%{_datadir}/kbd/consolefonts/B1.fnt" +rm "$RPM_BUILD_ROOT/%{_datadir}/kbd/consolefonts/ati.fnt" +rm "$RPM_BUILD_ROOT/%{_datadir}/kbd/consolefonts/mux.fnt" +rm "$RPM_BUILD_ROOT/%{_datadir}/kbd/consolefonts/neuropol.fnt" +rm "$RPM_BUILD_ROOT/%{_datadir}/kbd/consolefonts/nvidia.fnt" +rm "$RPM_BUILD_ROOT/%{_datadir}/kbd/consolefonts/rhx.fnt" +rm "$RPM_BUILD_ROOT/%{_datadir}/kbd/consolefonts/tosh.fnt" +rm "$RPM_BUILD_ROOT/%{_datadir}/hxtools/hxtools_bashrc.bash" +rm "$RPM_BUILD_ROOT/%{_datadir}/hxtools/hxtools_dircolors" +rm "$RPM_BUILD_ROOT/%{_datadir}/hxtools/hxtools_profile.bash" +rm "$RPM_BUILD_ROOT/%{_datadir}/hxtools/rfc2307bis-utf8.schema" rm "$RPM_BUILD_ROOT/%{_mandir}/man1/bsvplay.1"* rm "$RPM_BUILD_ROOT/%{_mandir}/man1/cctypeinfo.1"* rm "$RPM_BUILD_ROOT/%{_mandir}/man1/checkbrack.1"* @@ -154,9 +151,9 @@ rm "$RPM_BUILD_ROOT/%{_mandir}/man1/fnt2bdf.1"* rm "$RPM_BUILD_ROOT/%{_mandir}/man1/fxterm.1"* rm "$RPM_BUILD_ROOT/%{_mandir}/man1/git-author-stat.1"* rm "$RPM_BUILD_ROOT/%{_mandir}/man1/git-export-patch.1"* -rm "$RPM_BUILD_ROOT/%{_mandir}/man1/git-forest.1"* rm "$RPM_BUILD_ROOT/%{_mandir}/man1/git-revert-stats.1"* rm "$RPM_BUILD_ROOT/%{_mandir}/man1/git-track.1"* +rm "$RPM_BUILD_ROOT/%{_mandir}/man1/hcdplay.1"* rm "$RPM_BUILD_ROOT/%{_mandir}/man1/mailsplit.1"* rm "$RPM_BUILD_ROOT/%{_mandir}/man1/man2html.1"* rm "$RPM_BUILD_ROOT/%{_mandir}/man1/mod2ogg.1"* @@ -164,6 +161,7 @@ rm "$RPM_BUILD_ROOT/%{_mandir}/man1/mpg2ogg.1"* rm "$RPM_BUILD_ROOT/%{_mandir}/man1/omixer.1"* rm "$RPM_BUILD_ROOT/%{_mandir}/man1/oplay.1"* rm "$RPM_BUILD_ROOT/%{_mandir}/man1/orec.1"* +rm "$RPM_BUILD_ROOT/%{_mandir}/man1/pcmdiff.1"* rm "$RPM_BUILD_ROOT/%{_mandir}/man1/pesubst.1"* rm "$RPM_BUILD_ROOT/%{_mandir}/man1/png2wx.1"* rm "$RPM_BUILD_ROOT/%{_mandir}/man1/psthreads.1"* @@ -176,7 +174,6 @@ rm "$RPM_BUILD_ROOT/%{_mandir}/man1/stxdb.1"* rm "$RPM_BUILD_ROOT/%{_mandir}/man1/sysinfo.1"* rm "$RPM_BUILD_ROOT/%{_mandir}/man1/tailhex.1"* rm "$RPM_BUILD_ROOT/%{_mandir}/man1/vfontas.1"* -rm "$RPM_BUILD_ROOT/%{_mandir}/man1/wavdiff.1"* rm "$RPM_BUILD_ROOT/%{_mandir}/man1/wktimer.1"* rm "$RPM_BUILD_ROOT/%{_mandir}/man1/xcp.1"* rm "$RPM_BUILD_ROOT/%{_mandir}/man7/hxtools.7"* @@ -188,22 +185,21 @@ rm "$RPM_BUILD_ROOT/%{_mandir}/man8/utmp_register.8"* rm "$RPM_BUILD_ROOT/%{_mandir}/man8/vcsaview.8"* rm "$RPM_BUILD_ROOT/%{_mandir}/man8/xfs_irecover.8"* - -%clean -rm -rf $RPM_BUILD_ROOT - - # Only include tools needed for pam_mount %files -%defattr(-,root,root,-) %doc LICENSE.GPL2 LICENSE.GPL3 %{_bindir}/ofl +%{_bindir}/git-forest %{_libexecdir}/hxtools/fd0ssh %{_mandir}/man1/fd0ssh.1* +%{_mandir}/man1/git-forest.1* %{_mandir}/man1/ofl.1* - %changelog +* Wed Jul 03 2013 Christopher Meng - 20130605-1 +- Update to new release +- Add git-forest + * Thu Feb 14 2013 Fedora Release Engineering - 20120514-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild