OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/rpm?expand=0&rev=28

rpm-python.spec

@@ -16,7 +16,7 @@ License:        GPL v2 or later
 Group:          System/Packages
 Summary:        Python Bindings for Manipulating RPM Packages
 Version:        4.4.2
-Release:        181
+Release:        185
 Requires:       rpm = %{version}
 %py_requires
 Source99:       rpm.spec

rpm-shorten-changelog.diff

@@ -26,20 +26,6 @@
  	/* name */
  	name = s;
  	while (*s != '\0') s++;
-@@ -178,6 +185,13 @@ static int addChangelog(Header h, StringBuf sb)
- 	    return RPMERR_BADSPEC;
- 	}
- 
-+        /* remove domain part of the email address */
-+        p = strstr(name, "@suse");
-+        if (!p)
-+            p = strstr(name, "@novell");
-+        if (p)
-+            *p = '\0';
-+
- 	/* text */
- 	SKIPSPACE(text);
- 	if (! *text) {
 @@ -198,7 +212,8 @@ static int addChangelog(Header h, StringBuf sb)
  	    *s-- = '\0';
  	}

rpm.changes

@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Mon Dec  3 13:38:20 CET 2007 - dmueller@suse.de
+
+- list email address completely again (#344147)
+
 -------------------------------------------------------------------
 Fri Nov 16 20:46:42 CET 2007 - dmueller@suse.de
 

rpm.spec

@@ -20,7 +20,7 @@ PreReq:         %insserv_prereq %fillup_prereq permissions
 AutoReqProv:    on
 Summary:        The RPM Package Manager
 Version:        4.4.2
-Release:        148
+Release:        152
 Source:         rpm-%{version}.tar.bz2
 Source1:        RPM-HOWTO.tar.bz2
 Source2:        RPM-Tips.html.tar.bz2
@@ -345,7 +345,7 @@ Summary:        A C library for parsing command line parameters
 License:        LGPL v2.1 or later
 Group:          System/Libraries
 Version:        1.7
-Release:        376
+Release:        380
 #
 
 %description -n popt
@@ -368,7 +368,7 @@ Summary:        C Library for Parsing Command Line Parameters
 License:        LGPL v2.1 or later
 Group:          System/Libraries
 Version:        1.7
-Release:        376
+Release:        380
 Requires:       popt = 1.7
 Requires:       glibc-devel
 
@@ -403,6 +403,8 @@ Authors:
 %doc	%{_mandir}/man3/popt.3*
 
 %changelog
+* Mon Dec 03 2007 - dmueller@suse.de
+- list email address completely again (#344147)
 * Fri Nov 16 2007 - dmueller@suse.de
 - shorten changelogs in binary rpms (#308569)
   * saves 4.3MB for the one CD media