diff options
Diffstat (limited to 'source/a/rpm2tgz/patches')
6 files changed, 210 insertions, 0 deletions
diff --git a/source/a/rpm2tgz/patches/0001-fix-d-handling.patch b/source/a/rpm2tgz/patches/0001-fix-d-handling.patch new file mode 100644 index 000000000..ca15a98fd --- /dev/null +++ b/source/a/rpm2tgz/patches/0001-fix-d-handling.patch @@ -0,0 +1,26 @@ +From 976ac157b878ecc260d54e3b5a1f3cd4403259df Mon Sep 17 00:00:00 2001 +From: Igor Murzov <igor@gplsoft.org> +Date: Sun, 18 Apr 2010 21:13:02 +0400 +Subject: [PATCH 1/6] fix -d handling + +this option also requires get_meta_data() call +to set $PRGNAM properly +--- + rpm2tgz | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/rpm2tgz b/rpm2tgz +index 5c91c64..f5f206c 100755 +--- a/rpm2tgz ++++ b/rpm2tgz +@@ -202,6 +202,7 @@ for i in $* ; do + + # Save the rpm's summary and description as the slack-desc + if [ "$DESC" = "true" ]; then ++ get_meta_data $i + mkdir -p $TMPDIR/install + rpm -qp --qf %{SUMMARY} $i | sed -l 70 -r "s/^(.*)/$PRGNAM: $PRGNAM - \1\n/" > $TMPDIR/install/slack-desc + rpm -qp --qf %{DESCRIPTION} $i | sed -l 70 -r "s/^/$PRGNAM: /" >> $TMPDIR/install/slack-desc +-- +1.7.0.2 + diff --git a/source/a/rpm2tgz/patches/0002-fix-spurious-path-to-rpm-file-with-n-option.patch b/source/a/rpm2tgz/patches/0002-fix-spurious-path-to-rpm-file-with-n-option.patch new file mode 100644 index 000000000..92a9cb259 --- /dev/null +++ b/source/a/rpm2tgz/patches/0002-fix-spurious-path-to-rpm-file-with-n-option.patch @@ -0,0 +1,34 @@ +From e2a9bf836465dbb138ee83ccbe41b385e4648014 Mon Sep 17 00:00:00 2001 +From: Igor Murzov <igor@gplsoft.org> +Date: Sun, 18 Apr 2010 22:02:45 +0400 +Subject: [PATCH 2/6] fix spurious path to rpm file with -n option + +there is no need to prepend $CWD to the path to file, +as it produce wrong path in the case, when path to file +is not relative to the current working directory +--- + rpm2tgz | 5 +++-- + 1 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/rpm2tgz b/rpm2tgz +index f5f206c..c41f456 100755 +--- a/rpm2tgz ++++ b/rpm2tgz +@@ -213,11 +213,12 @@ for i in $* ; do + # makepkg to produce the .tgz: + if [ "$(basename $0)" = "rpm2tgz" ]; then + ( +- cd $TMPDIR + if [ "$META_NAME" = "true" ]; then +- get_meta_data $CWD/$i ++ get_meta_data $i ++ cd $TMPDIR + makepkg -l y -c n $CWD/$PRGNAM-$VERSION-$ARCH-${BUILD}.tgz + else ++ cd $TMPDIR + makepkg -l y -c n $CWD/$(basename $i .rpm).tgz + fi + ) +-- +1.7.0.2 + diff --git a/source/a/rpm2tgz/patches/0003-allow-every-user-to-use-rpm2tgz.patch b/source/a/rpm2tgz/patches/0003-allow-every-user-to-use-rpm2tgz.patch new file mode 100644 index 000000000..07d20286a --- /dev/null +++ b/source/a/rpm2tgz/patches/0003-allow-every-user-to-use-rpm2tgz.patch @@ -0,0 +1,29 @@ +From c57c0a39b6745203ebec36f37318ea3b0b4820f9 Mon Sep 17 00:00:00 2001 +From: Igor Murzov <igor@gplsoft.org> +Date: Sun, 18 Apr 2010 22:06:56 +0400 +Subject: [PATCH 3/6] allow every user to use rpm2tgz + +--- + rpm2tgz | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/rpm2tgz b/rpm2tgz +index c41f456..4818b74 100755 +--- a/rpm2tgz ++++ b/rpm2tgz +@@ -216,10 +216,10 @@ for i in $* ; do + if [ "$META_NAME" = "true" ]; then + get_meta_data $i + cd $TMPDIR +- makepkg -l y -c n $CWD/$PRGNAM-$VERSION-$ARCH-${BUILD}.tgz ++ /sbin/makepkg -l y -c n $CWD/$PRGNAM-$VERSION-$ARCH-${BUILD}.tgz + else + cd $TMPDIR +- makepkg -l y -c n $CWD/$(basename $i .rpm).tgz ++ /sbin/makepkg -l y -c n $CWD/$(basename $i .rpm).tgz + fi + ) + else +-- +1.7.0.2 + diff --git a/source/a/rpm2tgz/patches/0004-produce-more-compliant-slack-desc.patch b/source/a/rpm2tgz/patches/0004-produce-more-compliant-slack-desc.patch new file mode 100644 index 000000000..836b36e5a --- /dev/null +++ b/source/a/rpm2tgz/patches/0004-produce-more-compliant-slack-desc.patch @@ -0,0 +1,29 @@ +From 531b6f6c429678f69f2c90280a1e706eed6dcfbc Mon Sep 17 00:00:00 2001 +From: Igor Murzov <igor@gplsoft.org> +Date: Sun, 18 Apr 2010 22:56:56 +0400 +Subject: [PATCH 4/6] produce more compliant slack-desc + +slackware uses slightly different format for slack-desc files +from that which is used by rpm2tgz; +also remove all -l 70 options as it is only usable with l command +--- + rpm2tgz | 3 +-- + 1 files changed, 1 insertions(+), 2 deletions(-) + +diff --git a/rpm2tgz b/rpm2tgz +index 4818b74..cc25407 100755 +--- a/rpm2tgz ++++ b/rpm2tgz +@@ -204,8 +204,7 @@ for i in $* ; do + if [ "$DESC" = "true" ]; then + get_meta_data $i + mkdir -p $TMPDIR/install +- rpm -qp --qf %{SUMMARY} $i | sed -l 70 -r "s/^(.*)/$PRGNAM: $PRGNAM - \1\n/" > $TMPDIR/install/slack-desc +- rpm -qp --qf %{DESCRIPTION} $i | sed -l 70 -r "s/^/$PRGNAM: /" >> $TMPDIR/install/slack-desc ++ rpm -qp --qf '%{NAME} (%{SUMMARY})\n\n%{DESCRIPTION}\n\n %{URL}\n' $i | head -n 11 | sed -r "s/^/$PRGNAM: /" > $TMPDIR/install/slack-desc + fi + + # If this program was called as "rpm2targz", then repack as a plain +-- +1.7.0.2 + diff --git a/source/a/rpm2tgz/patches/0005-gzip-man-info-pages.patch b/source/a/rpm2tgz/patches/0005-gzip-man-info-pages.patch new file mode 100644 index 000000000..b4849c298 --- /dev/null +++ b/source/a/rpm2tgz/patches/0005-gzip-man-info-pages.patch @@ -0,0 +1,47 @@ +From 49c80142bf0f0ead2bcff8b03a39aa98e38f2dd9 Mon Sep 17 00:00:00 2001 +From: Igor Murzov <igor@gplsoft.org> +Date: Sun, 18 Apr 2010 23:11:55 +0400 +Subject: [PATCH 5/6] gzip man & info pages + +we don't want to repack package just to fix not gzipped man pages +--- + rpm2tgz | 23 +++++++++++++++++++++++ + 1 files changed, 23 insertions(+), 0 deletions(-) + +diff --git a/rpm2tgz b/rpm2tgz +index cc25407..32c450b 100755 +--- a/rpm2tgz ++++ b/rpm2tgz +@@ -206,6 +206,29 @@ for i in $* ; do + mkdir -p $TMPDIR/install + rpm -qp --qf '%{NAME} (%{SUMMARY})\n\n%{DESCRIPTION}\n\n %{URL}\n' $i | head -n 11 | sed -r "s/^/$PRGNAM: /" > $TMPDIR/install/slack-desc + fi ++ ++ # Compress and link manpages, if any: ++ if [ -d $TMPDIR/usr/man ]; then ++ ( cd $TMPDIR/usr/man ++ for manpagedir in $(find . -type d -name "man*") ; do ++ ( cd $manpagedir ++ for eachpage in $(find . -type l -maxdepth 1) ; do ++ ln -s $( readlink $eachpage ).gz $eachpage.gz ++ rm $eachpage ++ done ++ gzip -9 *.? ++ ) ++ done ++ ) ++ fi ++ ++ # Compress info files, if any: ++ if [ -d $TMPDIR/usr/info ]; then ++ ( cd $TMPDIR/usr/info ++ rm -f dir ++ gzip -9 * ++ ) ++ fi + + # If this program was called as "rpm2targz", then repack as a plain + # tar+gz archive. If it was called as "rpm2tgz", use Slackware's +-- +1.7.0.2 + diff --git a/source/a/rpm2tgz/patches/0006-should-we-use-.txz-format-in-slackware-current.patch b/source/a/rpm2tgz/patches/0006-should-we-use-.txz-format-in-slackware-current.patch new file mode 100644 index 000000000..5d86972f0 --- /dev/null +++ b/source/a/rpm2tgz/patches/0006-should-we-use-.txz-format-in-slackware-current.patch @@ -0,0 +1,45 @@ +From 60b1b269e13d6ac5f167c898f92d1c33a4caf779 Mon Sep 17 00:00:00 2001 +From: Igor Murzov <igor@gplsoft.org> +Date: Sun, 18 Apr 2010 23:19:05 +0400 +Subject: [PATCH 6/6] should we use .txz format in slackware-current? + +yes, everyone loves xz +--- + rpm2tgz | 10 +++++----- + 1 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/rpm2tgz b/rpm2tgz +index 32c450b..4dd3756 100755 +--- a/rpm2tgz ++++ b/rpm2tgz +@@ -231,22 +231,22 @@ for i in $* ; do + fi + + # If this program was called as "rpm2targz", then repack as a plain +- # tar+gz archive. If it was called as "rpm2tgz", use Slackware's +- # makepkg to produce the .tgz: ++ # tar+xz archive. If it was called as "rpm2tgz", use Slackware's ++ # makepkg to produce the .txz: + if [ "$(basename $0)" = "rpm2tgz" ]; then + ( + if [ "$META_NAME" = "true" ]; then + get_meta_data $i + cd $TMPDIR +- /sbin/makepkg -l y -c n $CWD/$PRGNAM-$VERSION-$ARCH-${BUILD}.tgz ++ /sbin/makepkg -l y -c n $CWD/$PRGNAM-$VERSION-$ARCH-${BUILD}.txz + else + cd $TMPDIR +- /sbin/makepkg -l y -c n $CWD/$(basename $i .rpm).tgz ++ /sbin/makepkg -l y -c n $CWD/$(basename $i .rpm).txz + fi + ) + else + ( cd $TMPDIR ; tar cf - . ) > $(basename $i .rpm).tar +- gzip -9 $(basename $i .rpm).tar ++ xz -9 $(basename $i .rpm).tar + fi + + # Remove temporary directory: +-- +1.7.0.2 + |