diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index f53fa5e..0000000 --- a/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -setuptool-1.19.6.tar.gz diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..1a7b06f --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +setuptool-1.19.9.tar.gz diff --git a/Makefile b/Makefile deleted file mode 100644 index f3e1e50..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: setuptool -# $Id: Makefile,v 1.1 2004/09/09 12:17:16 cvsdist Exp $ -NAME := setuptool -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attempt a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON) diff --git a/setuptool.spec b/setuptool.spec index 1a6b62a..ae03f4b 100644 --- a/setuptool.spec +++ b/setuptool.spec @@ -1,6 +1,6 @@ Name: setuptool -Version: 1.19.7 -Release: 1%{?dist} +Version: 1.19.9 +Release: 2%{?dist} Summary: A text mode system configuration tool License: GPLv2+ Group: Applications/System @@ -16,10 +16,9 @@ to access all of the text mode configuration programs included in the operating system distribution. %prep -%setup -q -n %{name} +%setup -q %build -./autogen.sh %configure make %{?_smp_mflags} @@ -35,15 +34,26 @@ rm -rf $RPM_BUILD_ROOT %defattr(-,root,root,-) %doc README COPYING %{_bindir}/setup -%config %{_sysconfdir}/pam.d/* -%config(noreplace) %{_sysconfdir}/security/console.apps/* +%config(noreplace) %{_sysconfdir}/pam.d/setup +%config(noreplace) %{_sysconfdir}/security/console.apps/setup %{_sbindir}/setup %dir %{_datadir}/%{name} %dir %{_datadir}/%{name}/setuptool.d %dir %{_sysconfdir}/setuptool.d -%config %{_sysconfdir}/setuptool.d/* +%config(noreplace) %{_sysconfdir}/setuptool.d/* %changelog +* Mon Nov 02 2009 Michal Hlavinka 1.19.9-2 +- spec cleanup + +* Tue Oct 21 2009 Michal Hlavinka 1.19.9-1 +- update path of firewall configuration tool (#529794) +- update translations + +* Mon Oct 12 2009 Michal Hlavinka 1.19.8-1 +- add setup.1 man page +- update translations + * Mon Sep 14 2009 Michal Hlavinka - 1.19.7-1 - relase with updated translations diff --git a/sources b/sources index 7119dd3..743d304 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c346b838fd8960fff308b5a629fc3a27 setuptool-1.19.6.tar.gz +36546cdcaa56fd472172ca9bec9a6ddc setuptool-1.19.9.tar.gz