From 7015888beb4a198a15705d3eb34f9b4489401a80 Mon Sep 17 00:00:00 2001 From: Guillaume Rousse Date: Fri, 29 Jun 2007 22:42:43 +0000 Subject: rename ChangeLog to NEWS --- ChangeLog | 7 ------- Makefile | 2 +- NEWS | 10 ++++++++++ 3 files changed, 11 insertions(+), 8 deletions(-) delete mode 100644 ChangeLog create mode 100644 NEWS diff --git a/ChangeLog b/ChangeLog deleted file mode 100644 index 64c24db..0000000 --- a/ChangeLog +++ /dev/null @@ -1,7 +0,0 @@ -2007-06-24 Anssi Hannula 0.26 - * fix fix-eol to not corrupt files it tries to convert - -2007-06-15 Guillaume Rousse 0.25 - * switch to a manual Changelog - * new helper script: fix-eol - * gprintify should not deal with daemon argument (fix #22066) diff --git a/Makefile b/Makefile index f941ac8..70ab4e7 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ SCRIPT_FILES = spec-helper clean_files clean_perl compress_files strip_files \ fixpamd gprintify remove_info_dir relink_symlinks fix-eol BIN_FILES = macroszification MACROS_FILES = spec-helper.macros -FILES = AUTHORS Makefile ChangeLog Howto-spec-helper \ +FILES = AUTHORS Makefile NEWS Howto-spec-helper \ $(SCRIPT_FILES) $(BIN_FILES) $(MACROS_FILES:=.in) bindir = /usr/bin diff --git a/NEWS b/NEWS new file mode 100644 index 0000000..3d53fad --- /dev/null +++ b/NEWS @@ -0,0 +1,10 @@ +2007-06-30 Guillaume Rousse 0.26.1 + * rename ChangeLog to NEWS + +2007-06-24 Anssi Hannula 0.26 + * fix fix-eol to not corrupt files it tries to convert + +2007-06-15 Guillaume Rousse 0.25 + * switch to a manual Changelog + * new helper script: fix-eol + * gprintify should not deal with daemon argument (fix #22066) -- cgit v1.2.1 From 7dca66d40744464157970cbbd4fa2c841249e362 Mon Sep 17 00:00:00 2001 From: Guillaume Rousse Date: Fri, 29 Jun 2007 22:42:45 +0000 Subject: rename Howto-spec-helper to README --- Howto-spec-helper | 29 ----------------------------- Makefile | 2 +- NEWS | 1 + README | 29 +++++++++++++++++++++++++++++ 4 files changed, 31 insertions(+), 30 deletions(-) delete mode 100644 Howto-spec-helper create mode 100644 README diff --git a/Howto-spec-helper b/Howto-spec-helper deleted file mode 100644 index 91b4037..0000000 --- a/Howto-spec-helper +++ /dev/null @@ -1,29 +0,0 @@ -From: Frederic Lepied -Subject: [Cooker] spec-helper -To: cooker@linux-mandrake.com -Date: 22 Feb 2000 14:45:21 +0100 - -For information. - -Starting from rpm-3.0.4-0.2mdk, the spec-helper package must be -installed as a dependency of the rpm-build package. - -The spec-helper script is called automatically at the end of the -%install section to compress info and man pages, strip files and -remove backup files from the $RPM_BUILD_ROOT dir. The %install section -can be cleaned off this tasks but the %files section about man and -info pages must be specified without the .bz2 extension but with an * -instead. The goal is to have vendor neutral spec files. - -Example: - -%files -/usr/man/man1/alias.1* - -and not - -%files -/usr/man/man1/alias.1.bz2 - --- -Fred - May the source be with you \ No newline at end of file diff --git a/Makefile b/Makefile index 70ab4e7..95d7688 100644 --- a/Makefile +++ b/Makefile @@ -7,7 +7,7 @@ SCRIPT_FILES = spec-helper clean_files clean_perl compress_files strip_files \ fixpamd gprintify remove_info_dir relink_symlinks fix-eol BIN_FILES = macroszification MACROS_FILES = spec-helper.macros -FILES = AUTHORS Makefile NEWS Howto-spec-helper \ +FILES = AUTHORS Makefile NEWS README \ $(SCRIPT_FILES) $(BIN_FILES) $(MACROS_FILES:=.in) bindir = /usr/bin diff --git a/NEWS b/NEWS index 3d53fad..f2234b7 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,6 @@ 2007-06-30 Guillaume Rousse 0.26.1 * rename ChangeLog to NEWS + * rename Howto-spec-helper to README 2007-06-24 Anssi Hannula 0.26 * fix fix-eol to not corrupt files it tries to convert diff --git a/README b/README new file mode 100644 index 0000000..91b4037 --- /dev/null +++ b/README @@ -0,0 +1,29 @@ +From: Frederic Lepied +Subject: [Cooker] spec-helper +To: cooker@linux-mandrake.com +Date: 22 Feb 2000 14:45:21 +0100 + +For information. + +Starting from rpm-3.0.4-0.2mdk, the spec-helper package must be +installed as a dependency of the rpm-build package. + +The spec-helper script is called automatically at the end of the +%install section to compress info and man pages, strip files and +remove backup files from the $RPM_BUILD_ROOT dir. The %install section +can be cleaned off this tasks but the %files section about man and +info pages must be specified without the .bz2 extension but with an * +instead. The goal is to have vendor neutral spec files. + +Example: + +%files +/usr/man/man1/alias.1* + +and not + +%files +/usr/man/man1/alias.1.bz2 + +-- +Fred - May the source be with you \ No newline at end of file -- cgit v1.2.1 From ea98a204f1191f393da7c1dd8b884be5a65d0f8e Mon Sep 17 00:00:00 2001 From: Guillaume Rousse Date: Fri, 29 Jun 2007 22:42:47 +0000 Subject: drop deprecated spec-helper script --- Makefile | 2 +- NEWS | 1 + spec-helper | 76 ------------------------------------------------------------- 3 files changed, 2 insertions(+), 77 deletions(-) delete mode 100755 spec-helper diff --git a/Makefile b/Makefile index 95d7688..f1a23e7 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ PACKAGE = spec-helper VERSION = 0.26 SVNPATH = svn+ssh://svn.mandriva.com/svn/soft/rpm/$(PACKAGE) -SCRIPT_FILES = spec-helper clean_files clean_perl compress_files strip_files \ +SCRIPT_FILES = clean_files clean_perl compress_files strip_files \ lib_symlinks gprintify.py fix-mo translate_menu.pl \ fixpamd gprintify remove_info_dir relink_symlinks fix-eol BIN_FILES = macroszification diff --git a/NEWS b/NEWS index f2234b7..bca49a3 100644 --- a/NEWS +++ b/NEWS @@ -1,6 +1,7 @@ 2007-06-30 Guillaume Rousse 0.26.1 * rename ChangeLog to NEWS * rename Howto-spec-helper to README + * drop deprecated spec-helper script 2007-06-24 Anssi Hannula 0.26 * fix fix-eol to not corrupt files it tries to convert diff --git a/spec-helper b/spec-helper deleted file mode 100755 index c68b84f..0000000 --- a/spec-helper +++ /dev/null @@ -1,76 +0,0 @@ -#!/bin/sh - -# Olivier Thauvin Sat May 20 14:47:17 CEST 2006: -# This file is now deprecated, see spec-helper.macro.in - -#--------------------------------------------------------------- -# Project : Mandrake Linux -# Module : spec-helper -# File : spec-helper -# Version : $Id$ -# Author : Frederic Lepied -# Created On : Wed Feb 9 16:25:21 2000 -#--------------------------------------------------------------- - -if [ -z "$RPM_BUILD_ROOT" ]; then - echo "no RPM_BUILD_ROOT variable; exiting." 1>&2 - exit 0 -fi - -if [ ! -d $RPM_BUILD_ROOT ]; then - exit 0 -fi - -SPEC_HELPER_ROOT=${SPEC_HELPER_ROOT=/usr/share/spec-helper} -PATH=$SPEC_HELPER_ROOT:$PATH -export PATH - -# usage -usage() { - echo "usage: spec-helper [-l|-c|-m|-s|-L|-g|-p|-i|-mo|-M]" 1>&2 - echo "-c don't clean up files" 1>&2 - echo "-m don't compress files" 1>&2 - echo "-s don't strip files" 1>&2 - echo "-l don't fix full link as relative." 1>&2 - echo "-L don't build lib symlinks." 1>&2 - echo "-g don't grpintify init scripts." 1>&2 - echo "-p don't fix pam.d configs." 1>&2 - echo "-i don't delete info dir." 1>&2 - echo "-mo don't fix bad translations." 1>&2 - echo "-M don't translate menus." 1>&2 -} - -# handle options -while [ $# != 0 ]; do - case $1 in - -c) DONT_CLEANUP=1;; - -m) DONT_COMPRESS=1;; - -s) DONT_STRIP=1;; - -l) DONT_RELINK=1;; - -L) DONT_SYMLINK_LIBS=1;; - -g) DONT_GPRINTIFY=1;; - -p) DONT_FIX_PAMD_CONFIGS=1;; - -i) DONT_REMOVE_INFO_DIR=1;; - -mo) DONT_FIX_MO=1;; - -M) DONT_TRANSLATE_MENU=1;; - *) usage; exit 1;; - esac - - shift -done - -test -z "$DONT_CLEANUP" && echo -n "Cleaning files..." && clean_files && echo "done" -test -z "$DONT_COMPRESS" && echo -n "Compressing files..." && compress_files && echo "done" -test -z "$DONT_STRIP" && echo -n "Stripping files..." && strip_files && echo "done" -test -z "$DONT_RELINK" && echo -n "Relativisation of symlinks..." && relink_symlinks && echo "done" -test -z "$DONT_CLEAN_PERL" && echo -n "Clean perl..." && clean_perl && echo "done" -test -z "$DONT_SYMLINK_LIBS" && echo -n "Building libraries symlinks..." && lib_symlinks && echo "done" -test -z "$DONT_GPRINTIFY" && echo -n "printify initscripts..." && gprintify && echo "done" -test -z "$DONT_FIX_PAMD_CONFIGS" && echo -n "Fixing pam.d config files..." && fixpamd && echo "done" -test -z "$DONT_REMOVE_INFO_DIR" && echo -n "Removing info dir..." && remove_info_dir && echo "done" -test -z "$DONT_FIX_MO" && echo -n "Fixing translations..." && fix-mo && echo "done" -test -z "$DONT_TRANSLATE_MENU" && echo -n "Translating menus..." && translate_menu.pl && echo "done" - -exit 0 - -# spec-helper ends here -- cgit v1.2.1 From 27e71a3afa6857e3bb864a3ef4575d07e8dbf0e6 Mon Sep 17 00:00:00 2001 From: Guillaume Rousse Date: Fri, 29 Jun 2007 22:42:49 +0000 Subject: make sure fix-eol keep original file permissions --- fix-eol | 3 +++ 1 file changed, 3 insertions(+) diff --git a/fix-eol b/fix-eol index 7d3bf21..15d1b0f 100644 --- a/fix-eol +++ b/fix-eol @@ -40,7 +40,10 @@ sub convert { my $tmp = $out->filename; $out = undef; + # rename file, taking care to keep original permissions + my $perms = (stat $_)[2] & 07777; rename($tmp, $_) or die "Unable to rename $tmp to $_: $!"; + chmod($perms, $_); } close($in); -- cgit v1.2.1 From b0b5a224f85f2afd9aea2103b77b4a30892be3d5 Mon Sep 17 00:00:00 2001 From: Guillaume Rousse Date: Fri, 29 Jun 2007 22:42:50 +0000 Subject: make sure fix-eol keep original file permissions --- NEWS | 1 + 1 file changed, 1 insertion(+) diff --git a/NEWS b/NEWS index bca49a3..8f992f5 100644 --- a/NEWS +++ b/NEWS @@ -2,6 +2,7 @@ * rename ChangeLog to NEWS * rename Howto-spec-helper to README * drop deprecated spec-helper script + * make sure fix-eol keep original file permission 2007-06-24 Anssi Hannula 0.26 * fix fix-eol to not corrupt files it tries to convert -- cgit v1.2.1 From 3d80b4855f1c68d852f6e6d79522fdb6f59827c7 Mon Sep 17 00:00:00 2001 From: Guillaume Rousse Date: Fri, 29 Jun 2007 22:42:52 +0000 Subject: bump version --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index f1a23e7..a769cda 100644 --- a/Makefile +++ b/Makefile @@ -1,5 +1,5 @@ PACKAGE = spec-helper -VERSION = 0.26 +VERSION = 0.26.1 SVNPATH = svn+ssh://svn.mandriva.com/svn/soft/rpm/$(PACKAGE) SCRIPT_FILES = clean_files clean_perl compress_files strip_files \ -- cgit v1.2.1