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

lzma-payload.diff

@@ -1,6 +1,7 @@
-diff -purN build/pack.c build/pack.c
---- build/pack.c	2007-12-03 18:24:44.000000000 +0100
-+++ build/pack.c	2007-12-03 18:49:50.000000000 +0100
+Index: build/pack.c
+===================================================================
+--- build/pack.c.orig
++++ build/pack.c
 @@ -479,6 +479,11 @@ int writeRPM(Header *hdrp, unsigned char
  	    /* Add prereq on rpm version that understands bzip2 payloads */
  	    (void) rpmlibNeedsFeature(h, "PayloadIsBzip2", "3.0.5-1");
@@ -13,10 +14,11 @@ diff -purN build/pack.c build/pack.c
  	strcpy(buf, rpmio_flags);
  	buf[s - rpmio_flags] = '\0';
  	(void) headerAddEntry(h, RPMTAG_PAYLOADFLAGS, RPM_STRING_TYPE, buf+1, 1);
-diff -purN lib/psm.c lib/psm.c
---- lib/psm.c	2007-12-03 18:24:45.000000000 +0100
-+++ lib/psm.c	2007-12-03 19:07:03.000000000 +0100
-@@ -2068,6 +2068,8 @@ psm->te->h = headerFree(psm->te->h);
+Index: lib/psm.c
+===================================================================
+--- lib/psm.c.orig
++++ lib/psm.c
+@@ -2097,6 +2097,8 @@ psm->te->h = headerFree(psm->te->h);
  	    t = stpcpy(t, ".gzdio");
  	if (!strcmp(payload_compressor, "bzip2"))
  	    t = stpcpy(t, ".bzdio");
@@ -25,35 +27,36 @@ diff -purN lib/psm.c lib/psm.c
  	rc = RPMRC_OK;
      }	break;
  
-diff -purN lib/rpmlibprov.c lib/rpmlibprov.c
---- lib/rpmlibprov.c	2007-12-03 18:24:45.000000000 +0100
-+++ lib/rpmlibprov.c	2007-12-03 19:14:35.000000000 +0100
-@@ -56,7 +56,10 @@ static struct rpmlibProvides_s rpmlibPro
+Index: lib/rpmlibprov.c
+===================================================================
+--- lib/rpmlibprov.c.orig
++++ lib/rpmlibprov.c
+@@ -59,6 +59,9 @@ static struct rpmlibProvides_s rpmlibPro
  	(                RPMSENSE_EQUAL),
      N_("internal support for lua scripts.") },
  #endif
--    { NULL,				NULL, 0,	NULL }
 +    { "rpmlib(PayloadIsLzma)",         "4.4.2-1",
 +	(RPMSENSE_RPMLIB|RPMSENSE_EQUAL),
 +     N_("package payload can be compressed using lzma.") },
-+    { NULL,				NULL, 0,	NULL }
+     { NULL,				NULL, 0,	NULL }
  };
  
- void rpmShowRpmlibProvides(FILE * fp)
-diff -purN macros.in macros.in
---- macros.in	2007-12-03 18:24:43.000000000 +0100
-+++ macros.in	2007-12-03 18:49:50.000000000 +0100
-@@ -321,6 +321,7 @@ package or when debugging this package.\
+Index: macros.in
+===================================================================
+--- macros.in.orig
++++ macros.in
+@@ -326,6 +326,7 @@ package or when debugging this package.\
  #	Compression type and level for source/binary package payloads.
  #		"w9.gzdio"	gzip level 9 (default).
  #		"w9.bzdio"	bzip2 level 9.
 +#		"w5.lzdio"	lzma level 5. (best compromise)
  #
  #%_source_payload	w9.gzdio
- #%_binary_payload	w9.gzdio
-diff -purN rpm2cpio.c rpm2cpio.c
---- rpm2cpio.c	2007-12-03 18:24:43.000000000 +0100
-+++ rpm2cpio.c	2007-12-03 18:49:50.000000000 +0100
+ %_binary_payload	w2.lzdio
+Index: rpm2cpio.c
+===================================================================
+--- rpm2cpio.c.orig
++++ rpm2cpio.c
 @@ -76,6 +76,8 @@ int main(int argc, char **argv)
  	    t = stpcpy(t, ".gzdio");
  	if (!strcmp(payload_compressor, "bzip2"))
@@ -63,10 +66,11 @@ diff -purN rpm2cpio.c rpm2cpio.c
      }
  
      gzdi = Fdopen(fdi, rpmio_flags);	/* XXX gzdi == fdi */
-diff -purN rpmio/rpmio.h rpmio/rpmio.h
---- rpmio/rpmio.h	2007-12-03 18:24:43.000000000 +0100
-+++ rpmio/rpmio.h	2007-12-03 19:19:56.000000000 +0100
-@@ -662,6 +662,10 @@ int ufdGetFile( /*@killref@*/ FD_t sfd, 
+Index: rpmio/rpmio.h
+===================================================================
+--- rpmio/rpmio.h.orig
++++ rpmio/rpmio.h
+@@ -669,6 +669,10 @@ int ufdGetFile( /*@killref@*/ FD_t sfd,
  
  /**
   */
@@ -77,8 +81,10 @@ diff -purN rpmio/rpmio.h rpmio/rpmio.h
  /*@observer@*/ /*@unchecked@*/ extern FDIO_t fadio;
  /*@=exportlocal@*/
  /*@}*/
---- scripts/rpm2cpio.sh	2002-02-04 17:53:52.000000000 +0100
-+++ scripts/rpm2cpio.sh	2007-11-30 17:28:51.000000000 +0100
+Index: scripts/rpm2cpio.sh
+===================================================================
+--- scripts/rpm2cpio.sh.orig
++++ scripts/rpm2cpio.sh
 @@ -23,4 +23,14 @@ dl=`expr 256 \* \( 256 \* \( 256 \* $6 +
  hdrsize=`expr 8 + 16 \* $il + $dl`
  o=`expr $o + $hdrsize`
@@ -95,9 +101,11 @@ diff -purN rpmio/rpmio.h rpmio/rpmio.h
 +    *)        dd if="$pkg" ibs=$o skip=1 2>/dev/null | unlzma ;;
 +    #*)        echo "Unrecognized rpm file: $pkg"; return 1 ;;
 +esac
---- rpmio/Makefile.am.lzma	2008-03-12 15:19:38.000000000 +0100
-+++ rpmio/Makefile.am	2008-03-12 15:19:54.000000000 +0100
-@@ -41,7 +41,7 @@
+Index: rpmio/Makefile.am
+===================================================================
+--- rpmio/Makefile.am.orig
++++ rpmio/Makefile.am
+@@ -41,7 +41,7 @@ librpmio_la_LDFLAGS = -release 4.4 $(LDF
  	@WITH_MAGIC_LIB@ \
  	@WITH_ZLIB_LIB@ \
  	-lpthread