RPM Package Manager, CVS Repository http://rpm5.org/cvs/ ____________________________________________________________________________
Server: rpm5.org Name: Jeff Johnson Root: /v/rpm/cvs Email: [email protected] Module: popt Date: 17-Feb-2010 20:43:51 Branch: HEAD Handle: 2010021719434802 Added files: popt popt.spec.in test-poptrc.in popt/auto .cvsignore Makefile.am popt.desc.in popt.types.in Modified files: popt .cvsignore CHANGES Makefile.am configure.ac popt/po cs.po da.po de.po eo.po es.po fi.po fr.po ga.po gl.po hu.po id.po is.po it.po ja.po ko.po nb.po nl.po pl.po popt.pot pt.po ro.po ru.po sk.po sl.po sv.po th.po tr.po uk.po vi.po wa.po zh_CN.po zh_TW.po Removed files: popt popt.spec test-poptrc Log: - make distcheck is now squeaky clean. - permit VPATH builds. - add shallow tests using ISP/RAS api-sanity-autotest.pl. Summary: Revision Changes Path 1.26 +4 -0 popt/.cvsignore 1.119 +3 -0 popt/CHANGES 1.57 +19 -12 popt/Makefile.am 1.1 +8 -0 popt/auto/.cvsignore 1.1 +12 -0 popt/auto/Makefile.am 1.1 +28 -0 popt/auto/popt.desc.in 1.1 +60 -0 popt/auto/popt.types.in 1.53 +26 -8 popt/configure.ac 1.71 +1 -1 popt/po/cs.po 1.68 +1 -1 popt/po/da.po 1.73 +1 -1 popt/po/de.po 1.6 +1 -1 popt/po/eo.po 1.67 +1 -1 popt/po/es.po 1.62 +1 -1 popt/po/fi.po 1.68 +1 -1 popt/po/fr.po 1.16 +1 -1 popt/po/ga.po 1.69 +1 -1 popt/po/gl.po 1.68 +1 -1 popt/po/hu.po 1.57 +1 -1 popt/po/id.po 1.68 +1 -1 popt/po/is.po 1.63 +1 -1 popt/po/it.po 1.67 +1 -1 popt/po/ja.po 1.67 +1 -1 popt/po/ko.po 1.17 +1 -1 popt/po/nb.po 1.19 +1 -1 popt/po/nl.po 1.71 +1 -1 popt/po/pl.po 1.113 +2 -2 popt/po/popt.pot 1.67 +1 -1 popt/po/pt.po 1.84 +1 -1 popt/po/ro.po 1.68 +1 -1 popt/po/ru.po 1.77 +1 -1 popt/po/sk.po 1.67 +1 -1 popt/po/sl.po 1.72 +1 -1 popt/po/sv.po 1.11 +1 -1 popt/po/th.po 1.72 +1 -1 popt/po/tr.po 1.68 +1 -1 popt/po/uk.po 1.18 +1 -1 popt/po/vi.po 1.67 +1 -1 popt/po/wa.po 1.21 +1 -1 popt/po/zh_CN.po 1.17 +1 -1 popt/po/zh_TW.po 1.45 +0 -75 popt/popt.spec 1.3 +76 -0 popt/popt.spec.in 1.7 +0 -13 popt/test-poptrc 1.1 +13 -0 popt/test-poptrc.in ____________________________________________________________________________ patch -p0 <<'@@ .' Index: popt/.cvsignore ============================================================================ $ cvs diff -u -r1.25 -r1.26 .cvsignore --- popt/.cvsignore 12 Feb 2010 22:29:12 -0000 1.25 +++ popt/.cvsignore 17 Feb 2010 19:43:48 -0000 1.26 @@ -1,3 +1,4 @@ +.ccache .deps .depend .libs @@ -9,6 +10,7 @@ aclocal.m4 autom4te* build +clang config.cache config.guess config.h @@ -29,10 +31,12 @@ m4 missing mkinstalldirs +popt.spec stamp-h stamp-h1 stamp-h.in tdict +test-poptrc test1 test2 test3 @@ . patch -p0 <<'@@ .' Index: popt/CHANGES ============================================================================ $ cvs diff -u -r1.118 -r1.119 CHANGES --- popt/CHANGES 19 Jan 2010 00:39:09 -0000 1.118 +++ popt/CHANGES 17 Feb 2010 19:43:48 -0000 1.119 @@ -1,4 +1,7 @@ 1.15 -> 1.16: + - make distcheck is now squeaky clean. + - permit VPATH builds. + - add shallow tests using ISP/RAS api-sanity-autotest.pl. - prefix bit set routines with popt to avoid symbol coolisions w rpm. - add tdict.c to exercise popt bit sets against /usr/dict/words. - add poptBitsArgs() method to generate args bit set. @@ . patch -p0 <<'@@ .' Index: popt/Makefile.am ============================================================================ $ cvs diff -u -r1.56 -r1.57 Makefile.am --- popt/Makefile.am 18 Aug 2009 22:06:22 -0000 1.56 +++ popt/Makefile.am 17 Feb 2010 19:43:48 -0000 1.57 @@ -2,30 +2,30 @@ AUTOMAKE_OPTIONS = 1.4 foreign -LINT = splint +LINT = splint +MCCABE = pmccabe -EXTRA_DIST = config.rpath autogen.sh CHANGES $(man_MANS) popt.spec \ +EXTRA_DIST = config.rpath lookup3.c autogen.sh CHANGES $(man_MANS) popt.spec \ footer_no_timestamp.html libpopt.vers \ - testit.sh test-poptrc test3-data/0* \ - po/*.in po/*.po po/popt.pot \ + testit.sh test-poptrc \ popt.ps -SUBDIRS = po +SUBDIRS = po . auto AM_CPPFLAGS = -I. -I$(top_srcdir) noinst_HEADERS = poptint.h system.h -noinst_PROGRAMS = test1 test2 test3 tdict +noinst_PROGRAMS = test1 test2 tdict # test3 test1_SOURCES = test1.c test1_LDFLAGS = test1_LDADD = $(usrlib_LTLIBRARIES) test2_SOURCES = test2.c test2_LDFLAGS = test2_LDADD = $(usrlib_LTLIBRARIES) -test3_SOURCES = test3.c -test3_LDFLAGS = -test3_LDADD = $(usrlib_LTLIBRARIES) +#test3_SOURCES = test3.c +#test3_LDFLAGS = +#test3_LDADD = $(usrlib_LTLIBRARIES) tdict_SOURCES = tdict.c tdict_LDFLAGS = tdict_LDADD = $(usrlib_LTLIBRARIES) @@ -33,9 +33,9 @@ noinst_SCRIPTS = testit.sh TESTS_ENVIRONMENT = \ -test1="./test1" +test1="$(top_builddir)/test1" -TESTS = testit.sh +TESTS = $(top_srcdir)/testit.sh include_HEADERS = popt.h @@ -49,13 +49,16 @@ pkgconfig_DATA = popt.pc if HAVE_LD_VERSION_SCRIPT -libpopt_la_LDFLAGS += -Wl,--version-script=$(srcdir)/libpopt.vers +libpopt_la_LDFLAGS += -Wl,--version-script=$(top_srcdir)/libpopt.vers endif man_MANS = popt.3 BUILT_SOURCES = popt.pc # popt.lcd +distclean-local: + rm -rf .ccache + .PHONY: updatepo updatepo: rsync -Lrtvz translationproject.org::tp/latest/popt/ po @@ -71,6 +74,10 @@ lint: $(LINT) ${DEFS} ${INCLUDES} test1.c ${libpopt_la_SOURCES} +.PHONY: mccabe +mccabe: + $(MCCABE) $(libpopt_la_SOURCES) | sort -n -r | head -n 10 + .PHONY: doxygen doxygen: Doxyfile rm -rf doxygen @@ . patch -p0 <<'@@ .' Index: popt/auto/.cvsignore ============================================================================ $ cvs diff -u -r0 -r1.1 .cvsignore --- /dev/null 2010-02-17 20:39:34 +0100 +++ .cvsignore 2010-02-17 20:43:49 +0100 @@ -0,0 +1,8 @@ +descriptors_storage +header_compile_errors +Makefile +Makefile.in +popt.desc +popt.types +test_results +tests @@ . patch -p0 <<'@@ .' Index: popt/auto/Makefile.am ============================================================================ $ cvs diff -u -r0 -r1.1 Makefile.am --- /dev/null 2010-02-17 20:39:34 +0100 +++ Makefile.am 2010-02-17 20:43:49 +0100 @@ -0,0 +1,12 @@ +AUTOMAKE_OPTIONS = 1.4 foreign + +AUTOTEST = api-sanity-autotest.pl + +TDIRS = descriptors_storage header_compile_errors test_results tests + +clean-local: + rm -rf $(TDIRS) + +check-local: + -[ -d tests ] && ${AUTOTEST} -l popt -d popt.desc -clean + -${AUTOTEST} -l popt -d popt.desc -st popt.types -gen -build -run @@ . patch -p0 <<'@@ .' Index: popt/auto/popt.desc.in ============================================================================ $ cvs diff -u -r0 -r1.1 popt.desc.in --- /dev/null 2010-02-17 20:39:34 +0100 +++ popt.desc.in 2010-02-17 20:43:49 +0100 @@ -0,0 +1,28 @@ +<version> + 1.15 +</version> + +<headers> + popt.h +</headers> + +<libs> + @abs_top_builddir@/.libs/libpopt.so +</libs> + +<include_paths> + @abs_top_srcdir@ +</include_paths> + +<gcc_options> + @CFLAGS@ +</gcc_options> + +<opaque_types> +</opaque_types> +<skip_interfaces> +</skip_interfaces> +<include_preamble> +</include_preamble> +<libs_depend> +</libs_depend> @@ . patch -p0 <<'@@ .' Index: popt/auto/popt.types.in ============================================================================ $ cvs diff -u -r0 -r1.1 popt.types.in --- /dev/null 2010-02-17 20:39:34 +0100 +++ popt.types.in 2010-02-17 20:43:49 +0100 @@ -0,0 +1,60 @@ +<?xml version="1.0" encoding="UTF-8"?> +<collection> + +<spec_type> + <kind> + common_param + </kind> + <name> + poptBits + </name> + <data_type> + poptBits + </data_type> + <value> + create_poptBits() + </value> + <global_code> + poptBits create_poptBits() + { + poptBits a = NULL; + (void) poptSaveBits(&a, 0, "foo"); + (void) poptSaveBits(&a, 0, "bar"); + (void) poptSaveBits(&a, 0, "baz"); + return a; + } + </global_code> +</spec_type> + +<spec_type> + <kind> + normal + </kind> + <data_type> + const char *** + </data_type> + <value> + &av + </value> + <global_code> + #include <malloc.h> + </global_code> + <init_code> + const char ** av = NULL; + </init_code> + <final_code> + free(av[0]); + free(av); + </final_code> + <associating> + <interfaces> + poptSaveString + </interfaces> + <links> + param1 + </links> + </associating> +</spec_type> + +</collection> + @@ . patch -p0 <<'@@ .' Index: popt/configure.ac ============================================================================ $ cvs diff -u -r1.52 -r1.53 configure.ac --- popt/configure.ac 18 Aug 2009 22:06:22 -0000 1.52 +++ popt/configure.ac 17 Feb 2010 19:43:48 -0000 1.53 @@ -1,8 +1,14 @@ AC_PREREQ(2.57) -AC_INIT(popt, 1.15, [email protected]) -AC_CANONICAL_TARGET +AC_INIT(popt, 1.16, [email protected]) AC_CONFIG_SRCDIR([popt.h]) AC_CONFIG_HEADERS([config.h]) +AC_CANONICAL_TARGET + +dnl Must come before AM_INIT_AUTOMAKE. +dnl AC_CONFIG_AUX_DIR([build-aux]) +AC_CONFIG_MACRO_DIR([m4]) +AM_INIT_AUTOMAKE([foreign -Wall]) +AM_MAINTAINER_MODE # Library code modified: REVISION++ # Interfaces changed/added/removed: CURRENT++ REVISION=0 @@ -12,14 +18,11 @@ AC_SUBST(LT_REVISION, 0) AC_SUBST(LT_AGE, 8) -dnl Must come before AM_INIT_AUTOMAKE. -dnl AC_CONFIG_AUX_DIR([build-aux]) -AM_INIT_AUTOMAKE([foreign -Wall]) -AC_CONFIG_MACRO_DIR([m4]) - ALL_LINGUAS="cs da de eo es fi fr ga gl hu id is it ja ko nb nl pl pt ro ru sk sl sv th tr uk vi wa zh_TW zh_CN" +AC_PROG_CC_STDC AC_PROG_CC + AC_PROG_INSTALL AC_PROG_LIBTOOL @@ -66,6 +69,16 @@ [ : ] ) AM_CONDITIONAL(HAVE_LD_VERSION_SCRIPT, test "$have_ld_version_script" = "yes") +AC_ARG_ENABLE(build-gcov, + AS_HELP_STRING([--enable-build-gcov], [build POPT instrumented for gcov]), [dnl + if test ".$enableval" = .yes; then + if test ".`$CC --version 2>&1 | grep 'GCC'`" != .; then + dnl # GNU GCC (usually "gcc") + CFLAGS="$CFLAGS -fprofile-arcs -ftest-coverage" + fi + fi +]) + AC_CHECK_FUNC(setreuid, [], [ AC_CHECK_LIB(ucb, setreuid, [if echo $LIBS | grep -- -lucb >/dev/null ;then :; else LIBS="$LIBS -lc -lucb" USEUCB=y;fi]) ]) @@ -114,4 +127,9 @@ [Full path to popt top_srcdir.]) AC_SUBST(POPT_SOURCE_PATH) -AC_OUTPUT([Doxyfile Makefile popt.pc po/Makefile.in]) +AC_CONFIG_SUBDIRS() +AC_CONFIG_FILES([ po/Makefile.in + Doxyfile Makefile popt.pc popt.spec test-poptrc + auto/Makefile auto/popt.desc auto/popt.types +]) +AC_OUTPUT @@ . patch -p0 <<'@@ .' Index: popt/po/cs.po ============================================================================ $ cvs diff -u -r1.70 -r1.71 cs.po --- popt/po/cs.po 19 Jan 2010 00:39:10 -0000 1.70 +++ popt/po/cs.po 17 Feb 2010 19:43:49 -0000 1.71 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: popt 1.14\n" "Report-Msgid-Bugs-To: <[email protected]>\n" -"POT-Creation-Date: 2009-09-13 11:40-0400\n" +"POT-Creation-Date: 2010-02-17 13:35-0500\n" "PO-Revision-Date: 2008-12-08 19:55+0100\n" "Last-Translator: Petr Pisar <[email protected]>\n" "Language-Team: Czech <[email protected]>\n" @@ . patch -p0 <<'@@ .' Index: popt/po/da.po ============================================================================ $ cvs diff -u -r1.67 -r1.68 da.po --- popt/po/da.po 19 Jan 2010 00:39:10 -0000 1.67 +++ popt/po/da.po 17 Feb 2010 19:43:49 -0000 1.68 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: popt-1.14\n" "Report-Msgid-Bugs-To: <[email protected]>\n" -"POT-Creation-Date: 2009-09-13 11:40-0400\n" +"POT-Creation-Date: 2010-02-17 13:35-0500\n" "PO-Revision-Date: 2008-09-15 00:00+0000\n" "Last-Translator: Joe Hansen <[email protected]>\n" "Language-Team: Danish <[email protected]>\n" @@ . patch -p0 <<'@@ .' Index: popt/po/de.po ============================================================================ $ cvs diff -u -r1.72 -r1.73 de.po --- popt/po/de.po 19 Jan 2010 00:39:10 -0000 1.72 +++ popt/po/de.po 17 Feb 2010 19:43:49 -0000 1.73 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: popt 1.15\n" "Report-Msgid-Bugs-To: <[email protected]>\n" -"POT-Creation-Date: 2009-09-13 11:40-0400\n" +"POT-Creation-Date: 2010-02-17 13:35-0500\n" "PO-Revision-Date: 2009-04-17 14:05+0200\n" "Last-Translator: Robert Scheck <[email protected]>\n" "Language-Team: German <[email protected]>\n" @@ . patch -p0 <<'@@ .' Index: popt/po/eo.po ============================================================================ $ cvs diff -u -r1.5 -r1.6 eo.po --- popt/po/eo.po 19 Jan 2010 00:39:10 -0000 1.5 +++ popt/po/eo.po 17 Feb 2010 19:43:49 -0000 1.6 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: popt 1.14\n" "Report-Msgid-Bugs-To: <[email protected]>\n" -"POT-Creation-Date: 2009-09-13 11:40-0400\n" +"POT-Creation-Date: 2010-02-17 13:35-0500\n" "PO-Revision-Date: 2008-08-03 15:50-0300\n" "Last-Translator: Felipe Castro <[email protected]>\n" "Language-Team: Esperanto <[email protected]>\n" @@ . patch -p0 <<'@@ .' Index: popt/po/es.po ============================================================================ $ cvs diff -u -r1.66 -r1.67 es.po --- popt/po/es.po 19 Jan 2010 00:39:10 -0000 1.66 +++ popt/po/es.po 17 Feb 2010 19:43:49 -0000 1.67 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: popt 1.12\n" "Report-Msgid-Bugs-To: <[email protected]>\n" -"POT-Creation-Date: 2009-09-13 11:40-0400\n" +"POT-Creation-Date: 2010-02-17 13:35-0500\n" "PO-Revision-Date: 2007-12-28 12:22+0100\n" "Last-Translator: Leandro Lucarella <[email protected]>\n" "Language-Team: Spanish <[email protected]>\n" @@ . patch -p0 <<'@@ .' Index: popt/po/fi.po ============================================================================ $ cvs diff -u -r1.61 -r1.62 fi.po --- popt/po/fi.po 19 Jan 2010 00:39:10 -0000 1.61 +++ popt/po/fi.po 17 Feb 2010 19:43:49 -0000 1.62 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: popt 1.14\n" "Report-Msgid-Bugs-To: <[email protected]>\n" -"POT-Creation-Date: 2009-09-13 11:40-0400\n" +"POT-Creation-Date: 2010-02-17 13:35-0500\n" "PO-Revision-Date: 2008-02-21 18:19+0200\n" "Last-Translator: Jorma Karvonen <[email protected]>\n" "Language-Team: Finnish <[email protected]>\n" @@ . patch -p0 <<'@@ .' Index: popt/po/fr.po ============================================================================ $ cvs diff -u -r1.67 -r1.68 fr.po --- popt/po/fr.po 19 Jan 2010 00:39:10 -0000 1.67 +++ popt/po/fr.po 17 Feb 2010 19:43:49 -0000 1.68 @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: popt 1.11\n" "Report-Msgid-Bugs-To: <[email protected]>\n" -"POT-Creation-Date: 2009-09-13 11:40-0400\n" +"POT-Creation-Date: 2010-02-17 13:35-0500\n" "PO-Revision-Date: 2003-06-22 23:43+0200\n" "Last-Translator: RPM French Translation <[email protected]>\n" "Language-Team: RPM French Translation <[email protected]>\n" @@ . patch -p0 <<'@@ .' Index: popt/po/ga.po ============================================================================ $ cvs diff -u -r1.15 -r1.16 ga.po --- popt/po/ga.po 19 Jan 2010 00:39:10 -0000 1.15 +++ popt/po/ga.po 17 Feb 2010 19:43:49 -0000 1.16 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: popt 1.14\n" "Report-Msgid-Bugs-To: <[email protected]>\n" -"POT-Creation-Date: 2009-09-13 11:40-0400\n" +"POT-Creation-Date: 2010-02-17 13:35-0500\n" "PO-Revision-Date: 2008-04-10 06:21-0500\n" "Last-Translator: Kevin Scannell <[email protected]>\n" "Language-Team: Irish <[email protected]>\n" @@ . patch -p0 <<'@@ .' Index: popt/po/gl.po ============================================================================ $ cvs diff -u -r1.68 -r1.69 gl.po --- popt/po/gl.po 19 Jan 2010 00:39:10 -0000 1.68 +++ popt/po/gl.po 17 Feb 2010 19:43:49 -0000 1.69 @@ -2,7 +2,7 @@ msgstr "" "Project-Id-Version: popt 1.11\n" "Report-Msgid-Bugs-To: <[email protected]>\n" -"POT-Creation-Date: 2009-09-13 11:40-0400\n" +"POT-Creation-Date: 2010-02-17 13:35-0500\n" "PO-Revision-Date: 2001-01-17 01:01+0100\n" "Last-Translator: Jesús Bravo Álvarez <[email protected]>\n" "Language-Team: Galician <[email protected]>\n" @@ . patch -p0 <<'@@ .' Index: popt/po/hu.po ============================================================================ $ cvs diff -u -r1.67 -r1.68 hu.po --- popt/po/hu.po 19 Jan 2010 00:39:10 -0000 1.67 +++ popt/po/hu.po 17 Feb 2010 19:43:49 -0000 1.68 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: popt 1.11\n" "Report-Msgid-Bugs-To: <[email protected]>\n" -"POT-Creation-Date: 2009-09-13 11:40-0400\n" +"POT-Creation-Date: 2010-02-17 13:35-0500\n" "PO-Revision-Date: 2007-06-21 00:45+0200\n" "Last-Translator: Gabor Kelemen <[email protected]>\n" "Language-Team: Hungarian <[email protected]>\n" @@ . patch -p0 <<'@@ .' Index: popt/po/id.po ============================================================================ $ cvs diff -u -r1.56 -r1.57 id.po --- popt/po/id.po 19 Jan 2010 00:39:10 -0000 1.56 +++ popt/po/id.po 17 Feb 2010 19:43:49 -0000 1.57 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: popt 1.14\n" "Report-Msgid-Bugs-To: <[email protected]>\n" -"POT-Creation-Date: 2009-09-13 11:40-0400\n" +"POT-Creation-Date: 2010-02-17 13:35-0500\n" "PO-Revision-Date: 2008-08-26 14:18+0700\n" "Last-Translator: Andhika Padmawan <[email protected]>\n" "Language-Team: Indonesian <[email protected]>\n" @@ . patch -p0 <<'@@ .' Index: popt/po/is.po ============================================================================ $ cvs diff -u -r1.67 -r1.68 is.po --- popt/po/is.po 19 Jan 2010 00:39:10 -0000 1.67 +++ popt/po/is.po 17 Feb 2010 19:43:49 -0000 1.68 @@ -2,7 +2,7 @@ msgstr "" "Project-Id-Version: popt 1.11\n" "Report-Msgid-Bugs-To: <[email protected]>\n" -"POT-Creation-Date: 2009-09-13 11:40-0400\n" +"POT-Creation-Date: 2010-02-17 13:35-0500\n" "PO-Revision-Date: 2001-06-08 01:35+0000\n" "Last-Translator: Richard Allen <[email protected]>\n" "Language-Team: is <[email protected]>\n" @@ . patch -p0 <<'@@ .' Index: popt/po/it.po ============================================================================ $ cvs diff -u -r1.62 -r1.63 it.po --- popt/po/it.po 19 Jan 2010 00:39:10 -0000 1.62 +++ popt/po/it.po 17 Feb 2010 19:43:49 -0000 1.63 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: popt-1.14\n" "Report-Msgid-Bugs-To: <[email protected]>\n" -"POT-Creation-Date: 2009-09-13 11:40-0400\n" +"POT-Creation-Date: 2010-02-17 13:35-0500\n" "PO-Revision-Date: 2008-11-28 15:32+0100\n" "Last-Translator: Vincenzo Campanella <[email protected]>\n" "Language-Team: Italian <[email protected]>\n" @@ . patch -p0 <<'@@ .' Index: popt/po/ja.po ============================================================================ $ cvs diff -u -r1.66 -r1.67 ja.po --- popt/po/ja.po 19 Jan 2010 00:39:10 -0000 1.66 +++ popt/po/ja.po 17 Feb 2010 19:43:49 -0000 1.67 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: popt 1.11\n" "Report-Msgid-Bugs-To: <[email protected]>\n" -"POT-Creation-Date: 2009-09-13 11:40-0400\n" +"POT-Creation-Date: 2010-02-17 13:35-0500\n" "PO-Revision-Date: 2003--8-25 19:00+0900\n" "Last-Translator: Yukihiro Nakai <[email protected]>\n" "Language-Team: Japanese <[email protected]>\n" @@ . patch -p0 <<'@@ .' Index: popt/po/ko.po ============================================================================ $ cvs diff -u -r1.66 -r1.67 ko.po --- popt/po/ko.po 19 Jan 2010 00:39:10 -0000 1.66 +++ popt/po/ko.po 17 Feb 2010 19:43:49 -0000 1.67 @@ -2,7 +2,7 @@ msgstr "" "Project-Id-Version: popt 1.11\n" "Report-Msgid-Bugs-To: <[email protected]>\n" -"POT-Creation-Date: 2009-09-13 11:40-0400\n" +"POT-Creation-Date: 2010-02-17 13:35-0500\n" "PO-Revision-Date: 2001-09-06 20:06+0900\n" "Last-Translator: Jong-Hoon Ryu <[email protected]>\n" "Language-Team: GNU Translation project <[email protected]>\n" @@ . patch -p0 <<'@@ .' Index: popt/po/nb.po ============================================================================ $ cvs diff -u -r1.16 -r1.17 nb.po --- popt/po/nb.po 19 Jan 2010 00:39:10 -0000 1.16 +++ popt/po/nb.po 17 Feb 2010 19:43:49 -0000 1.17 @@ -2,7 +2,7 @@ msgstr "" "Project-Id-Version: popt 1.11\n" "Report-Msgid-Bugs-To: <[email protected]>\n" -"POT-Creation-Date: 2009-09-13 11:40-0400\n" +"POT-Creation-Date: 2010-02-17 13:35-0500\n" "PO-Revision-Date: 2001-06-27 11:05+0200\n" "Last-Translator: Kjartan Maraas <[email protected]>\n" "Language-Team: Norwegian <[email protected]>\n" @@ . patch -p0 <<'@@ .' Index: popt/po/nl.po ============================================================================ $ cvs diff -u -r1.18 -r1.19 nl.po --- popt/po/nl.po 19 Jan 2010 00:39:10 -0000 1.18 +++ popt/po/nl.po 17 Feb 2010 19:43:49 -0000 1.19 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: popt 1.14\n" "Report-Msgid-Bugs-To: <[email protected]>\n" -"POT-Creation-Date: 2009-09-13 11:40-0400\n" +"POT-Creation-Date: 2010-02-17 13:35-0500\n" "PO-Revision-Date: 2008-02-20 19:26+0100\n" "Last-Translator: Tim Van Holder <[email protected]>\n" "Language-Team: Dutch <[email protected]>\n" @@ . patch -p0 <<'@@ .' Index: popt/po/pl.po ============================================================================ $ cvs diff -u -r1.70 -r1.71 pl.po --- popt/po/pl.po 19 Jan 2010 00:39:10 -0000 1.70 +++ popt/po/pl.po 17 Feb 2010 19:43:49 -0000 1.71 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: popt 1.14\n" "Report-Msgid-Bugs-To: <[email protected]>\n" -"POT-Creation-Date: 2009-09-13 11:40-0400\n" +"POT-Creation-Date: 2010-02-17 13:35-0500\n" "PO-Revision-Date: 2008-02-18 00:30+0100\n" "Last-Translator: Jakub Bogusz <[email protected]>\n" "Language-Team: Polish <[email protected]>\n" @@ . patch -p0 <<'@@ .' Index: popt/po/popt.pot ============================================================================ $ cvs diff -u -r1.112 -r1.113 popt.pot --- popt/po/popt.pot 19 Jan 2010 00:39:10 -0000 1.112 +++ popt/po/popt.pot 17 Feb 2010 19:43:49 -0000 1.113 @@ -5,9 +5,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: popt 1.15\n" +"Project-Id-Version: popt 1.16\n" "Report-Msgid-Bugs-To: <[email protected]>\n" -"POT-Creation-Date: 2009-09-13 11:40-0400\n" +"POT-Creation-Date: 2010-02-17 13:35-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <em...@address>\n" "Language-Team: LANGUAGE <[email protected]>\n" @@ . patch -p0 <<'@@ .' Index: popt/po/pt.po ============================================================================ $ cvs diff -u -r1.66 -r1.67 pt.po --- popt/po/pt.po 19 Jan 2010 00:39:10 -0000 1.66 +++ popt/po/pt.po 17 Feb 2010 19:43:49 -0000 1.67 @@ -2,7 +2,7 @@ msgstr "" "Project-Id-Version: popt 1.11\n" "Report-Msgid-Bugs-To: <[email protected]>\n" -"POT-Creation-Date: 2009-09-13 11:40-0400\n" +"POT-Creation-Date: 2010-02-17 13:35-0500\n" "PO-Revision-Date: 2002-02-13 18:32+0000\n" "Last-Translator: Pedro Morais <[email protected]>\n" "Language-Team: pt <[email protected]>\n" @@ . patch -p0 <<'@@ .' Index: popt/po/ro.po ============================================================================ $ cvs diff -u -r1.83 -r1.84 ro.po --- popt/po/ro.po 19 Jan 2010 00:39:10 -0000 1.83 +++ popt/po/ro.po 17 Feb 2010 19:43:49 -0000 1.84 @@ -2,7 +2,7 @@ msgstr "" "Project-Id-Version: popt 1.11\n" "Report-Msgid-Bugs-To: <[email protected]>\n" -"POT-Creation-Date: 2009-09-13 11:40-0400\n" +"POT-Creation-Date: 2010-02-17 13:35-0500\n" "PO-Revision-Date: 2000-06-14 23:23+EST\n" "Last-Translator: Cristian Gafton <[email protected]>\n" "Language-Team: Romanian <[email protected]>\n" @@ . patch -p0 <<'@@ .' Index: popt/po/ru.po ============================================================================ $ cvs diff -u -r1.67 -r1.68 ru.po --- popt/po/ru.po 19 Jan 2010 00:39:10 -0000 1.67 +++ popt/po/ru.po 17 Feb 2010 19:43:49 -0000 1.68 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: popt 1.14\n" "Report-Msgid-Bugs-To: <[email protected]>\n" -"POT-Creation-Date: 2009-09-13 11:40-0400\n" +"POT-Creation-Date: 2010-02-17 13:35-0500\n" "PO-Revision-Date: 2009-02-01 13:30+0300\n" "Last-Translator: Yuri Kozlov <[email protected]>\n" "Language-Team: Russian <[email protected]>\n" @@ . patch -p0 <<'@@ .' Index: popt/po/sk.po ============================================================================ $ cvs diff -u -r1.76 -r1.77 sk.po --- popt/po/sk.po 19 Jan 2010 00:39:10 -0000 1.76 +++ popt/po/sk.po 17 Feb 2010 19:43:49 -0000 1.77 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: popt 1.11\n" "Report-Msgid-Bugs-To: <[email protected]>\n" -"POT-Creation-Date: 2009-09-13 11:40-0400\n" +"POT-Creation-Date: 2010-02-17 13:35-0500\n" "PO-Revision-Date: 1999-08-04 21:40+0200\n" "Last-Translator: Stanislav Meduna <[email protected]>\n" "Language-Team: Slovak <[email protected]>\n" @@ . patch -p0 <<'@@ .' Index: popt/po/sl.po ============================================================================ $ cvs diff -u -r1.66 -r1.67 sl.po --- popt/po/sl.po 19 Jan 2010 00:39:10 -0000 1.66 +++ popt/po/sl.po 17 Feb 2010 19:43:49 -0000 1.67 @@ -2,7 +2,7 @@ msgstr "" "Project-Id-Version: popt 1.11\n" "Report-Msgid-Bugs-To: <[email protected]>\n" -"POT-Creation-Date: 2009-09-13 11:40-0400\n" +"POT-Creation-Date: 2010-02-17 13:35-0500\n" "PO-Revision-Date: 2000-09-05 12:30+0200\n" "Last-Translator: Roman Maurer <[email protected]>\n" "Language-Team: Slovenian <[email protected]>\n" @@ . patch -p0 <<'@@ .' Index: popt/po/sv.po ============================================================================ $ cvs diff -u -r1.71 -r1.72 sv.po --- popt/po/sv.po 19 Jan 2010 00:39:10 -0000 1.71 +++ popt/po/sv.po 17 Feb 2010 19:43:49 -0000 1.72 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: popt 1.14\n" "Report-Msgid-Bugs-To: <[email protected]>\n" -"POT-Creation-Date: 2009-09-13 11:40-0400\n" +"POT-Creation-Date: 2010-02-17 13:35-0500\n" "PO-Revision-Date: 2008-02-23 20:15+0100\n" "Last-Translator: Göran Uddeborg <[email protected]>\n" "Language-Team: Swedish <[email protected]>\n" @@ . patch -p0 <<'@@ .' Index: popt/po/th.po ============================================================================ $ cvs diff -u -r1.10 -r1.11 th.po --- popt/po/th.po 19 Jan 2010 00:39:10 -0000 1.10 +++ popt/po/th.po 17 Feb 2010 19:43:50 -0000 1.11 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: popt 1.14\n" "Report-Msgid-Bugs-To: <[email protected]>\n" -"POT-Creation-Date: 2009-09-13 11:40-0400\n" +"POT-Creation-Date: 2010-02-17 13:35-0500\n" "PO-Revision-Date: 2008-02-19 15:53+0700\n" "Last-Translator: Seksan Poltree <[email protected]>\n" "Language-Team: Thai <[email protected]>\n" @@ . patch -p0 <<'@@ .' Index: popt/po/tr.po ============================================================================ $ cvs diff -u -r1.71 -r1.72 tr.po --- popt/po/tr.po 19 Jan 2010 00:39:10 -0000 1.71 +++ popt/po/tr.po 17 Feb 2010 19:43:50 -0000 1.72 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: popt 1.11\n" "Report-Msgid-Bugs-To: <[email protected]>\n" -"POT-Creation-Date: 2009-09-13 11:40-0400\n" +"POT-Creation-Date: 2010-02-17 13:35-0500\n" "PO-Revision-Date: 2000-02-11 13:01+0200\n" "Last-Translator: Nilgun Belma Buguner <[email protected]>\n" "Language-Team: Turkish <[email protected]>\n" @@ . patch -p0 <<'@@ .' Index: popt/po/uk.po ============================================================================ $ cvs diff -u -r1.67 -r1.68 uk.po --- popt/po/uk.po 19 Jan 2010 00:39:10 -0000 1.67 +++ popt/po/uk.po 17 Feb 2010 19:43:50 -0000 1.68 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: popt 1.11\n" "Report-Msgid-Bugs-To: <[email protected]>\n" -"POT-Creation-Date: 2009-09-13 11:40-0400\n" +"POT-Creation-Date: 2010-02-17 13:35-0500\n" "PO-Revision-Date: 1999-09-30 16:54+0200\n" "Last-Translator: Yuri Syrota <[email protected]>\n" "Language-Team: Ukrainian <[email protected]>\n" @@ . patch -p0 <<'@@ .' Index: popt/po/vi.po ============================================================================ $ cvs diff -u -r1.17 -r1.18 vi.po --- popt/po/vi.po 19 Jan 2010 00:39:10 -0000 1.17 +++ popt/po/vi.po 17 Feb 2010 19:43:50 -0000 1.18 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: popt 1.14\n" "Report-Msgid-Bugs-To: <[email protected]>\n" -"POT-Creation-Date: 2009-09-13 11:40-0400\n" +"POT-Creation-Date: 2010-02-17 13:35-0500\n" "PO-Revision-Date: 2008-02-18 16:20+1030\n" "Last-Translator: Clytie Siddall <[email protected]>\n" "Language-Team: Vietnamese <[email protected]>\n" @@ . patch -p0 <<'@@ .' Index: popt/po/wa.po ============================================================================ $ cvs diff -u -r1.66 -r1.67 wa.po --- popt/po/wa.po 19 Jan 2010 00:39:10 -0000 1.66 +++ popt/po/wa.po 17 Feb 2010 19:43:50 -0000 1.67 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: popt 1.11\n" "Report-Msgid-Bugs-To: <[email protected]>\n" -"POT-Creation-Date: 2009-09-13 11:40-0400\n" +"POT-Creation-Date: 2010-02-17 13:35-0500\n" "PO-Revision-Date: 1999-03-18 23:11+0100\n" "Last-Translator: Nobody yet\n" "Language-Team: walon <[email protected]>\n" @@ . patch -p0 <<'@@ .' Index: popt/po/zh_CN.po ============================================================================ $ cvs diff -u -r1.20 -r1.21 zh_CN.po --- popt/po/zh_CN.po 19 Jan 2010 00:39:10 -0000 1.20 +++ popt/po/zh_CN.po 17 Feb 2010 19:43:50 -0000 1.21 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: popt 1.14\n" "Report-Msgid-Bugs-To: <[email protected]>\n" -"POT-Creation-Date: 2009-09-13 11:40-0400\n" +"POT-Creation-Date: 2010-02-17 13:35-0500\n" "PO-Revision-Date: 2008-02-18 20:16+0800\n" "Last-Translator: LI Daobing <[email protected]>\n" "Language-Team: Chinese (simplified) <translation-team-zh...@lists." @@ . patch -p0 <<'@@ .' Index: popt/po/zh_TW.po ============================================================================ $ cvs diff -u -r1.16 -r1.17 zh_TW.po --- popt/po/zh_TW.po 19 Jan 2010 00:39:10 -0000 1.16 +++ popt/po/zh_TW.po 17 Feb 2010 19:43:50 -0000 1.17 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: popt 1.11\n" "Report-Msgid-Bugs-To: <[email protected]>\n" -"POT-Creation-Date: 2009-09-13 11:40-0400\n" +"POT-Creation-Date: 2010-02-17 13:35-0500\n" "PO-Revision-Date: 2005-04-08 17:52+0800\n" "Last-Translator: Wei-Lun Chao <[email protected]>\n" "Language-Team: zh_TW <[email protected]>\n" @@ . rm -f popt/popt.spec <<'@@ .' Index: popt/popt.spec ============================================================================ [NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED] @@ . patch -p0 <<'@@ .' Index: popt/popt.spec.in ============================================================================ $ cvs diff -u -r0 -r1.3 popt.spec.in --- /dev/null 2010-02-17 20:39:34 +0100 +++ popt.spec.in 2010-02-17 20:43:49 +0100 @@ -0,0 +1,76 @@ +%{expand:%%global _pkgconfigdir %{_libdir}/pkgconfig} +%define _libdir /%{_lib} + +Summary: A C library for parsing command line parameters. +Name: popt +Version: 1.15 +Release: 1 +License: X Consortium +Group: System Environment/Libraries +Source: http://rpm5.org/files/popt/%{name}-%{version}.tar.gz +BuildRequires: gettext +BuildRoot: %{_tmppath}/%{name}-root + +%description +Popt is a C library for parsing command line parameters. Popt was +heavily influenced by the getopt() and getopt_long() functions, but it +improves on them by allowing more powerful argument expansion. Popt +can parse arbitrary argv[] style arrays and automatically set +variables based on command line arguments. Popt allows command line +arguments to be aliased via configuration files and includes utility +functions for parsing arbitrary strings into argv[] arrays using +shell-like rules. + +%prep +%setup -q + +%build +%configure +make + +%install +rm -rf $RPM_BUILD_ROOT +make DESTDIR=$RPM_BUILD_ROOT install +%find_lang popt + +%track +prog popt = { + version = %{version} + url = http://rpm5.org/%{name} + regex = %{name}-(\d+\.\d+\.\d+)\.tar\.gz +} + +%clean +rm -rf $RPM_BUILD_ROOT + +%files -f popt.lang +%defattr(-,root,root) +%{_libdir}/libpopt.* +%{_includedir}/popt.h +%{_mandir}/man3/popt.3* +%{_pkgconfigdir}/popt.pc + +%changelog +* Fri Apr 10 2009 Jeff Johnson <[email protected]> +- release popt-1.15 through rpm5.org. + +* Tue Dec 11 2007 Jeff Johnson <[email protected]> +- release popt-1.13 through rpm5.org. + +* Tue Jul 10 2007 Jeff Johnson <[email protected]> +- release popt-1.12 through rpm5.org. + +* Sat Jun 9 2007 Jeff Johnson <[email protected]> +- release popt-1.11 through rpm5.org. + +* Thu Dec 10 1998 Michael Johnson <[email protected]> +- released 1.2.2; see CHANGES + +* Tue Nov 17 1998 Michael K. Johnson <[email protected]> +- added man page to default install + +* Thu Oct 22 1998 Erik Troan <[email protected]> +- see CHANGES file for 1.2 + +* Thu Apr 09 1998 Erik Troan <[email protected]> +- added ./configure step to spec file @@ . rm -f popt/test-poptrc <<'@@ .' Index: popt/test-poptrc ============================================================================ [NO CHANGE SUMMARY BECAUSE FILE AS A WHOLE IS JUST REMOVED] @@ . patch -p0 <<'@@ .' Index: popt/test-poptrc.in ============================================================================ $ cvs diff -u -r0 -r1.1 test-poptrc.in --- /dev/null 2010-02-17 20:39:34 +0100 +++ test-poptrc.in 2010-02-17 20:43:49 +0100 @@ -0,0 +1,13 @@ +test1 alias --simple --arg2 \ + --POPTdesc=$"simple description" --POPTargs=$"ARG" +test1 alias --two --arg1 --arg2 alias +test1 alias --takerest -- +test1 alias -T --arg2 +test1 alias -O --arg1 + +test1 alias --grab --arg2 "'foo !#:+'" +test1 alias --grabbar --grab bar + +test1 exec --echo-args /bin/echo +test1 alias -e --echo-args +test1 exec -a /bin/echo @@ . ______________________________________________________________________ RPM Package Manager http://rpm5.org CVS Sources Repository [email protected]
