From bb79ab603a5ad770fafd7bd4fc25a59c8ddc0b67 Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Tue, 29 Sep 2009 06:50:24 +0000 Subject: [PATCH 1/6] Initialize branch F-12 for setuptool --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..06de2d2 --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-12 From 8019a0daf2d2828cf64afb876409361ea04a422b Mon Sep 17 00:00:00 2001 From: Michal Hlavinka Date: Mon, 12 Oct 2009 11:06:53 +0000 Subject: [PATCH 2/6] - add setup.1 man page - update translations --- .cvsignore | 2 +- setuptool.spec | 9 ++++++--- sources | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/.cvsignore b/.cvsignore index f53fa5e..f35996e 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -setuptool-1.19.6.tar.gz +setuptool-1.19.8.tar.gz diff --git a/setuptool.spec b/setuptool.spec index 1a6b62a..4da4324 100644 --- a/setuptool.spec +++ b/setuptool.spec @@ -1,5 +1,5 @@ Name: setuptool -Version: 1.19.7 +Version: 1.19.8 Release: 1%{?dist} Summary: A text mode system configuration tool License: GPLv2+ @@ -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} @@ -44,6 +43,10 @@ rm -rf $RPM_BUILD_ROOT %config %{_sysconfdir}/setuptool.d/* %changelog +* 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..664b3c5 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -c346b838fd8960fff308b5a629fc3a27 setuptool-1.19.6.tar.gz +4c8abd1cdaf51909c3bac76d55921739 setuptool-1.19.8.tar.gz From a4cf8f3a25cdfdb42a9633f4b966422f115e9dc6 Mon Sep 17 00:00:00 2001 From: Michal Hlavinka Date: Tue, 20 Oct 2009 18:04:22 +0000 Subject: [PATCH 3/6] - update path of firewall configuration tool (#529794) - update translations --- .cvsignore | 2 +- setuptool.spec | 6 +++++- sources | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.cvsignore b/.cvsignore index f35996e..1a7b06f 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -setuptool-1.19.8.tar.gz +setuptool-1.19.9.tar.gz diff --git a/setuptool.spec b/setuptool.spec index 4da4324..738d65d 100644 --- a/setuptool.spec +++ b/setuptool.spec @@ -1,5 +1,5 @@ Name: setuptool -Version: 1.19.8 +Version: 1.19.9 Release: 1%{?dist} Summary: A text mode system configuration tool License: GPLv2+ @@ -43,6 +43,10 @@ rm -rf $RPM_BUILD_ROOT %config %{_sysconfdir}/setuptool.d/* %changelog +* 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 diff --git a/sources b/sources index 664b3c5..743d304 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -4c8abd1cdaf51909c3bac76d55921739 setuptool-1.19.8.tar.gz +36546cdcaa56fd472172ca9bec9a6ddc setuptool-1.19.9.tar.gz From a1fd72c6476dcce3a0a638f5f09709483439d96c Mon Sep 17 00:00:00 2001 From: Michal Hlavinka Date: Mon, 2 Nov 2009 15:43:31 +0000 Subject: [PATCH 4/6] - spec cleanup --- setuptool.spec | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/setuptool.spec b/setuptool.spec index 738d65d..ae03f4b 100644 --- a/setuptool.spec +++ b/setuptool.spec @@ -1,6 +1,6 @@ Name: setuptool Version: 1.19.9 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A text mode system configuration tool License: GPLv2+ Group: Applications/System @@ -34,15 +34,18 @@ 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 From e7752bd01b955c8b7886f9b9e5a0e4692ea0be2d Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:39:02 +0000 Subject: [PATCH 5/6] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index f3e1e50..d6da125 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: setuptool -# $Id: Makefile,v 1.1 2004/09/09 12:17:16 cvsdist Exp $ +# $Id: Makefile,v 1.2 2007/10/15 19:22:50 notting 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 +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From a61ba5f9e2521d41b9d553a43cf8d1e3dbfd7192 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 12:40:10 +0000 Subject: [PATCH 6/6] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index d6da125..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: setuptool -# $Id: Makefile,v 1.2 2007/10/15 19:22:50 notting 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 $$d/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/branch b/branch deleted file mode 100644 index 06de2d2..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-12