rpms/popt/devel popt-1.13-multilib.patch, NONE, 1.1 popt-1.13-popt_fprintf.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 popt.spec, 1.1, 1.2 sources, 1.2, 1.3 popt-1.12-20070815cvs.patch, 1.1, NONE

[Robert Scheck (robert)]

Author: robert

Update of /cvs/pkgs/rpms/popt/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9367/devel

Modified Files:
	.cvsignore popt.spec sources 
Added Files:
	popt-1.13-multilib.patch popt-1.13-popt_fprintf.patch 
Removed Files:
	popt-1.12-20070815cvs.patch 
Log Message:
- Upgrade to 1.13 (#290531, #332201, #425803)
- Solved multilib problems at doxygen generated files (#342921)


popt-1.13-multilib.patch:

--- NEW FILE popt-1.13-multilib.patch ---
Patch by Robert Scheck <robert at fedoraproject.org> for popt >= 1.13, which solves the
multilib/multiarch problem by removing the timestamp within the footer from the doxygen
generated files.

--- popt-1.13/Doxyfile.in				2007-05-25 19:36:23.000000000 +0200
+++ popt-1.13/Doxyfile.in.multilib			2007-12-15 17:07:34.000000000 +0100
@@ -659,7 +659,7 @@
 # each generated HTML page. If it is left blank doxygen will generate a 
 # standard footer.
 
-HTML_FOOTER            = 
+HTML_FOOTER            = footer_no_timestamp.html
 
 # The HTML_STYLESHEET tag can be used to specify a user-defined cascading 
 # style sheet that is used by each HTML page. It can be used to 
--- popt-1.13/footer_no_timestamp.html			1970-01-01 01:00:00.000000000 +0100
+++ popt-1.13/footer_no_timestamp.html.multilib		2007-12-14 22:21:35.000000000 +0100
@@ -0,0 +1,5 @@
+<hr size="1"><address style="text-align: right;"><small>Generated for $projectname by 
+<a href="http://www.doxygen.org/index.html">
+<img src="doxygen.png" alt="doxygen" align="middle" border="0"></a> $doxygenversion </small></address>
+</body>
+</html>

popt-1.13-popt_fprintf.patch:

--- NEW FILE popt-1.13-popt_fprintf.patch ---
Patch by Jeff Johnson <jbj at rpm5.org> for popt >= 1.13, which reverts all POPT_fprintf()
usage cases to avoid broken umlauts in --help output at some non-UTF8 locales. It should
not break anything, just restore the behaviour of popt 1.12 again to not introduce a new
regression. Clueless modified by Robert Scheck <robert at rpm5.org> to hide the last found
two locale regression as well.

--- popt-1.13/popthelp.c				2007-11-04 16:46:25.000000000 +0100
+++ popt-1.13/popthelp.c.popt_fprintf			2007-12-30 22:10:24.000000000 +0100
@@ -281,7 +281,6 @@
     char * left;
     size_t nb = maxLeftCol + 1;
     int displaypad = 0;
-    int xx;
 
     /* Make sure there's more than enough room in target buffer. */
     if (opt->longName)	nb += strlen(opt->longName);
@@ -406,9 +405,9 @@
     }
 
     if (help)
-	xx = POPT_fprintf(fp,"  %-*s   ", (int)(maxLeftCol+displaypad), left);
+	fprintf(fp,"  %-*s   ", (int)(maxLeftCol+displaypad), left);
     else {
-	xx = POPT_fprintf(fp,"  %s\n", left); 
+	fprintf(fp,"  %s\n", left);
 	goto out;
     }
 
@@ -428,18 +427,19 @@
 	if (ch == help) break;		/* give up */
 	while (ch > (help + 1) && _isspaceptr(ch))
 	    ch = POPT_prev_char (ch);
-	ch++;
+	ch = POPT_next_char(ch);
 
 	sprintf(format, "%%.%ds\n%%%ds", (int) (ch - help), (int) indentLength);
 	/*@-formatconst@*/
-	xx = POPT_fprintf(fp, format, help, " ");
+	fprintf(fp, format, help, " ");
 	/*@=formatconst@*/
 	help = ch;
-	while (_isspaceptr(help) && *help) help++;
+	while (_isspaceptr(help) && *help)
+	    help = POPT_next_char(help);
 	helpLength = strlen(help);
     }
 
-    if (helpLength) xx = POPT_fprintf(fp, "%s\n", help);
+    if (helpLength) fprintf(fp, "%s\n", help);
     help = NULL;
 
 out:
@@ -553,7 +553,6 @@
 {
     const struct poptOption * opt;
     const char *sub_transdom;
-    int xx;
 
     if (table == poptAliasOptions) {
 	itemHelp(fp, con->aliases, con->numAliases, columns, NULL);
@@ -577,7 +576,7 @@
 	    sub_transdom = translation_domain;
 	    
 	if (opt->descrip)
-	    xx = POPT_fprintf(fp, "\n%s\n", D_(sub_transdom, opt->descrip));
+	    fprintf(fp, "\n%s\n", D_(sub_transdom, opt->descrip));
 
 	singleTableHelp(con, fp, opt->arg, columns, sub_transdom);
     }
@@ -767,7 +766,7 @@
 	    translation_domain = (const char *)opt->arg;
 	} else if ((opt->argInfo & POPT_ARG_MASK) == POPT_ARG_INCLUDE_TABLE) {
 	    if (done) {
-		int i;
+		int i = done->nopts;
 		if (done->opts != NULL)
 		for (i = 0; i < done->nopts; i++) {
 		    const void * that = done->opts[i];
--- popt-1.13/poptint.c					2007-11-04 16:56:24.000000000 +0100
+++ popt-1.13/poptint.c.popt_fprintf			2007-12-30 22:10:24.000000000 +0100
@@ -124,6 +124,18 @@
     }
 }
 
+char *
+POPT_next_char (const char *str)
+{
+    char *p = (char *)str;
+
+    while (1) {
+       p++;
+       if ((*p & 0xc0) != (char)0x80)
+           return (char *)p;
+    }
+}
+
 int
 POPT_fprintf (FILE* stream, const char *format, ...)
 {
--- popt-1.13/poptint.h					2007-12-11 19:02:29.000000000 +0100
+++ popt-1.13/poptint.h.popt_fprintf			2007-12-30 22:10:24.000000000 +0100
@@ -144,11 +144,14 @@
 #endif
 #endif
 
+char *POPT_prev_char (/*@returned@*/ const char *str)
+	/*@*/;
+
+char *POPT_next_char (/*@returned@*/ const char *str)
+	/*@*/;
+
 int   POPT_fprintf (FILE* stream, const char *format, ...)
 	/*@globals fileSystem @*/
 	/*@modifies stream, fileSystem @*/;
 
-char *POPT_prev_char (/*@returned@*/ const char *str)
-	/*@*/;
-
 #endif


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/popt/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	23 Aug 2007 21:21:22 -0000	1.2
+++ .cvsignore	30 Dec 2007 21:38:50 -0000	1.3
@@ -1 +1 @@
-popt-1.12.tar.gz
+popt-1.13.tar.gz


Index: popt.spec
===================================================================
RCS file: /cvs/pkgs/rpms/popt/devel/popt.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- popt.spec	23 Aug 2007 21:21:22 -0000	1.1
+++ popt.spec	30 Dec 2007 21:38:50 -0000	1.2
@@ -1,12 +1,13 @@
 Summary:	C library for parsing command line parameters
 Name:		popt
-Version:	1.12
-Release:	3%{?dist}
+Version:	1.13
+Release:	1%{?dist}
 License:	MIT
 Group:		System Environment/Libraries
 URL:		http://www.rpm5.org/
 Source:		http://www.rpm5.org/files/%{name}/%{name}-%{version}.tar.gz
-Patch0:		popt-1.12-20070815cvs.patch
+Patch0:		popt-1.13-multilib.patch
+Patch1:		popt-1.13-popt_fprintf.patch
 BuildRequires:	gettext, doxygen, graphviz
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -41,13 +42,18 @@
 
 %prep
 %setup -q
-%patch0 -p1 -b .20070815cvs
+%patch0 -p1 -b .multilib
+%patch1 -p1 -b .popt_fprintf
 
 %build
 %configure --libdir=/%{_lib}
 make %{?_smp_mflags}
 doxygen
 
+# Solve multilib problems by changing the internal PNG timestamp to a reference timestamp;
+# see http://fedoraproject.org/wiki/PackagingDrafts/MultilibTricks for further information.
+perl -pi -e "s/tIME.{11}/tIME\x07\xd7\x0c\x0b\x17\x0a\x28\xc4\x1d\x23\xfc/" doxygen/html/*.png
+
 %install
 rm -rf $RPM_BUILD_ROOT
 make DESTDIR=$RPM_BUILD_ROOT install
@@ -60,6 +66,9 @@
 popd
 mv -f $RPM_BUILD_ROOT/%{_lib}/libpopt.a $RPM_BUILD_ROOT%{_libdir}/libpopt.a
 
+# Multiple popt configurations are possible
+mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/popt.d
+
 %find_lang %{name}
 
 %clean
@@ -72,6 +81,7 @@
 %files -f %{name}.lang
 %defattr(-,root,root)
 %doc CHANGES COPYING
+%{_sysconfdir}/popt.d
 /%{_lib}/libpopt.so.*
 
 %files devel
@@ -86,6 +96,10 @@
 %{_libdir}/libpopt.a
 
 %changelog
+* Sun Dec 30 2007 Robert Scheck <robert at fedoraproject.org> 1.13-1
+- Upgrade to 1.13 (#290531, #332201, #425803)
+- Solved multilib problems at doxygen generated files (#342921)
+
 * Thu Aug 23 2007 Robert Scheck <robert at fedoraproject.org> 1.12-3
 - Added buildrequirement to graphviz (#249352)
 - Backported bugfixes from CVS (#102254, #135428 and #178413)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/popt/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	23 Aug 2007 21:21:22 -0000	1.2
+++ sources	30 Dec 2007 21:38:50 -0000	1.3
@@ -1 +1 @@
-f45290e9ac4b1cf209d0042eb6755543  popt-1.12.tar.gz
+b5c47ce0185c83f947953c77000533bf  popt-1.13.tar.gz


--- popt-1.12-20070815cvs.patch DELETED ---