configure.ac | 2 +- revisor.spec.in | 14 +++++++++++--- revisor/splittree.py | 3 ++- scripts/Makefile.am | 2 +- 4 files changed, 15 insertions(+), 6 deletions(-)

New commits: commit ec44a982b31295345dd4e136259f82bbbf08460b Author: Jeroen van Meeuwen (Fedora Unity) kanarip@fedoraunity.org Date: Thu Feb 26 08:14:16 2009 +0100

Fix some packaging issues Bump version number

diff --git a/configure.ac b/configure.ac index eff8bba..33d2ebe 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([revisor], 2.1.3) +AC_INIT([revisor], 2.1.4) AC_SUBST([RELEASE], 1)

AC_CONFIG_SRCDIR(revisor/__init__.py.in) diff --git a/revisor.spec.in b/revisor.spec.in index c4f8c91..e7b638d 100644 --- a/revisor.spec.in +++ b/revisor.spec.in @@ -388,6 +388,7 @@ desktop-file-install --vendor="fedora" \ rm -rf $RPM_BUILD_ROOT

%files +%defattr(-,root,root,-)

%files cli %defattr(-,root,root,-) @@ -401,8 +402,8 @@ rm -rf $RPM_BUILD_ROOT %{python_sitelib}/revisor/*.pyo %{_bindir}/* %{_sbindir}/* -%dir %{_libdir}/revisor -%dir %{_libdir}/revisor/scripts +%dir %{_prefix}/lib/revisor +%dir %{_prefix}/lib/revisor/scripts %dir %{_sysconfdir}/revisor %dir %{_sysconfdir}/revisor/conf.d %config(noreplace) %{_sysconfdir}/revisor/revisor.conf @@ -411,10 +412,11 @@ rm -rf $RPM_BUILD_ROOT %config(noreplace) %{_sysconfdir}/security/console.apps/* %{_datadir}/locale/*/LC_MESSAGES/revisor.mo %defattr(0755,root,root,-) -%{_libdir}/revisor/scripts/* +%{_prefix}/lib/revisor/scripts/*

%if %{pkg_comps} %files comps +%defattr(-,root,root,-) %dir %{_datadir}/revisor/comps/ %{_datadir}/revisor/comps/* %{_datadir}/revisor/comps-cleanup.xsl @@ -552,6 +554,12 @@ rm -rf $RPM_BUILD_ROOT

%changelog * @DATESTAMP@ Jeroen van Meeuwen <kanarip a fedoraunity.org> @VERSION@-@RELEASE@ +- Fix configuration file issues +- Better estimation for the size of a tree that is to become an iso +- Huge improvements to package ordering +- Exclude boot.iso from installation media iso files + +* Thu Feb 25 2009 Jeroen van Meeuwen <kanarip a fedoraunity.org> 2.1.3-1 - Add modmock, modhub, modcomposer - Rebuild for Fedora 10 - Include modisolinux and modreuseinstaller diff --git a/revisor/splittree.py b/revisor/splittree.py index e67b01e..a2105b2 100755 --- a/revisor/splittree.py +++ b/revisor/splittree.py @@ -1,9 +1,10 @@ -#!/usr/bin/env python # # splittree.py # # Copyright (C) 2003, 2004, 2005 Red Hat, Inc. All rights reserved. # +# Copyright (C) 2008, 2009, Jeroen van Meeuwen. No rights reserved. Pfff. +# # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 2 of the License, or diff --git a/scripts/Makefile.am b/scripts/Makefile.am index b8da104..23b4bed 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -1,4 +1,4 @@ -scriptdir = $(libdir)/revisor/scripts +scriptdir = $(prefix)/lib/revisor/scripts

script_SCRIPTS = \ DEVEL-buildinstall \