version 0.26.1v0.26.1

5 files changed, 12 insertions, 79 deletions

diff --git a/Makefile b/Makefile
index f941ac8..a769cda 100644
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,13 @@
 PACKAGE = spec-helper
-VERSION = 0.26
+VERSION = 0.26.1
 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
 MACROS_FILES = spec-helper.macros
-FILES        = AUTHORS Makefile ChangeLog Howto-spec-helper \
+FILES        = AUTHORS Makefile NEWS README \
 	       $(SCRIPT_FILES) $(BIN_FILES) $(MACROS_FILES:=.in)
 
 bindir       = /usr/bin
diff --git a/ChangeLog b/NEWS
index 64c24db..8f992f5 100644
--- a/ChangeLog
+++ b/NEWS
@@ -1,3 +1,9 @@
+2007-06-30 Guillaume Rousse <guillomovitch@mandriva.org> 0.26.1
+	* 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 <anssi@mandriva.org> 0.26
 	* fix fix-eol to not corrupt files it tries to convert
 
diff --git a/Howto-spec-helper b/README
index 91b4037..91b4037 100644
--- a/Howto-spec-helper
+++ b/README
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);
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