From b649c60f0f6bdb303bd73bbd736f5dad82994a0c Mon Sep 17 00:00:00 2001 From: Jesse Keating Date: Wed, 17 Feb 2010 03:10:27 +0000 Subject: [PATCH 1/4] Initialize branch F-13 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..baa94ef --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-13 From d73200af54a321309f983fa10e0b64fb35a2551b Mon Sep 17 00:00:00 2001 From: Michal Hlavinka Date: Wed, 7 Apr 2010 10:49:11 +0000 Subject: [PATCH 2/4] - update translations --- .cvsignore | 2 +- setuptool.spec | 7 +++++-- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.cvsignore b/.cvsignore index 1a7b06f..e62dfdd 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -setuptool-1.19.9.tar.gz +setuptool-1.19.10.tar.gz diff --git a/setuptool.spec b/setuptool.spec index ae03f4b..7999e59 100644 --- a/setuptool.spec +++ b/setuptool.spec @@ -1,6 +1,6 @@ Name: setuptool -Version: 1.19.9 -Release: 2%{?dist} +Version: 1.19.10 +Release: 1%{?dist} Summary: A text mode system configuration tool License: GPLv2+ Group: Applications/System @@ -43,6 +43,9 @@ rm -rf $RPM_BUILD_ROOT %config(noreplace) %{_sysconfdir}/setuptool.d/* %changelog +* Wed Apr 07 2010 Michal Hlavinka 1.19.10-1 +- update translations + * Mon Nov 02 2009 Michal Hlavinka 1.19.9-2 - spec cleanup diff --git a/sources b/sources index 743d304..454294d 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -36546cdcaa56fd472172ca9bec9a6ddc setuptool-1.19.9.tar.gz +7dae48437eca3d713cee3985a5f80b8d setuptool-1.19.10.tar.gz From 2e22ebf92247a86ca73d7e31897ba294f54eb64c Mon Sep 17 00:00:00 2001 From: Michal Hlavinka Date: Wed, 19 May 2010 12:02:53 +0000 Subject: [PATCH 3/4] - install man page --- setup.1 | 39 +++++++++++++++++++++++++++++++++++++++ setuptool.spec | 14 +++++++++++++- 2 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 setup.1 diff --git a/setup.1 b/setup.1 new file mode 100644 index 0000000..e275540 --- /dev/null +++ b/setup.1 @@ -0,0 +1,39 @@ +.\" Copyright (C) 2009 Red Hat, Inc. All rights reserved. +.\" Man page author: Michal Hlavinka +.TH setup 1 2009-10-07 "Linux" "setuptool" +.SH NAME +setup \- A text mode system configuration tool +.SH SYNOPSIS +\fBsetup\fP +.SH DESCRIPTION +The setuptool program (\fBsetup\fP) is a front-end menu program for a group of other +tools, mostly \fBsystem\-config\-*\-tui\fP tools. The list of options which it presents is assembled by scanning +/etc/setuptool.d and /usr/share/setuptool/setuptool.d for files. + +Each file in the directory should contain one or more lines of text. Each line +contains from one to four fields which are separated by "|" characters. In +order, they are: + - the path to the binary to invoke (mandatory) + - the untranslated name of the application which should be displayed + (If unset, defaults to the path of the binary, but don't depend on that.) + - the gettext textdomain in which a translation of the name of the application can be found + (If unset, defaults to "setup".) + - the directory in which translations for the textdomain can be found + (If unset, defaults to "/usr/share/locale".) + +If multiple entries with the same untranslated name exist, the one which was +read FIRST takes precedence. Files are read in name collation order. +.SH EXAMPLE +A contrived example would create /etc/setuptool.d/00bogus with these contents: + +.nf + /bin/ls --color; /bin/sleep 5|Example "ls" invocation. +.fi + +or + +.nf + /bin/ls --color; /bin/sleep 5|Give this help list|libc +.fi + +to use one of libc's (not meaningful here, but) translatable messages. diff --git a/setuptool.spec b/setuptool.spec index 7999e59..92a6534 100644 --- a/setuptool.spec +++ b/setuptool.spec @@ -1,11 +1,13 @@ Name: setuptool Version: 1.19.10 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A text mode system configuration tool License: GPLv2+ Group: Applications/System Url: http://git.fedorahosted.org/git/?p=setuptool.git Source: setuptool-%{version}.tar.gz +#for setuptool <= 1.19.10 +Source1: setup.1 BuildRoot: %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX) BuildRequires: newt-devel, gettext, perl-XML-Parser, glib2-devel, intltool Requires: usermode @@ -25,6 +27,12 @@ make %{?_smp_mflags} %install rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT + +#for setuptool <= 1.19.10 +cp %{SOURCE1} . +gzip setup.1 +install -D setup.1.gz $RPM_BUILD_ROOT%{_mandir}/man1/setup.1.gz + %find_lang setup %clean @@ -41,8 +49,12 @@ rm -rf $RPM_BUILD_ROOT %dir %{_datadir}/%{name}/setuptool.d %dir %{_sysconfdir}/setuptool.d %config(noreplace) %{_sysconfdir}/setuptool.d/* +%{_mandir}/man1/setup.1.gz %changelog +* Wed May 19 2010 Michal Hlavinka 1.19.10-2 +- install man page + * Wed Apr 07 2010 Michal Hlavinka 1.19.10-1 - update translations From c6b9e18d2b87b12f3ad3e176f61504eae3fdbd37 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 29 Jul 2010 12:40:08 +0000 Subject: [PATCH 4/4] 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 baa94ef..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-13