From 54e987e3b2fa8414bcbcda972b3d6f804008dc92 Mon Sep 17 00:00:00 2001 From: Davide Madrisan Date: Sun, 22 Jan 2012 18:11:22 +0100 Subject: [PATCH] kde4-flist2rpmvars: remove file Signed-off-by: Davide Madrisan --- ChangeLog | 3 + autospec.spec.in | 4 +- tools/Makefile | 4 +- tools/kde4-flist2rpmvars.in | 137 ------------------------------------ 4 files changed, 8 insertions(+), 140 deletions(-) delete mode 100644 tools/kde4-flist2rpmvars.in diff --git a/ChangeLog b/ChangeLog index 51c061c..dd961f4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -27,6 +27,9 @@ Changes in version 1.9.1 * po/it/pck-update - Davide Madrisan: Updated. + * kde4-flist2rpmvars - Davide Madrisan: + Remove file: it's superseded by the last added pck-update feature. + -------------------------------------------------------------------------------- Changes in version 1.9.0 - Silvan Birthday Release diff --git a/autospec.spec.in b/autospec.spec.in index d8e23d4..cafc730 100644 --- a/autospec.spec.in +++ b/autospec.spec.in @@ -139,12 +139,14 @@ make install DESTDIR=%{buildroot} prefix=%{_prefix} %defattr(-,root,root) %{_bindir}/extract-specs %{_bindir}/autoupdate-* -%{_bindir}/kde4-flist2rpmvars %changelog * @date@ Davide Madrisan @version@-@release@ - update to @version@ +* Sun Jan 15 2012 Davide Madrisan 1.9.0-1mamba +- update to 1.9.0 + * Thu Dec 29 2011 Davide Madrisan 1.8.2-1mamba - update to 1.8.2 diff --git a/tools/Makefile b/tools/Makefile index 0696ac2..f12ae23 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -1,5 +1,5 @@ # Makefile for autospec -# Copyright (C) 2008 by Davide Madrisan +# Copyright (C) 2008,2012 by Davide Madrisan # This program is free software; you can redistribute it and/or modify it under # the terms of version 2 of the GNU General Public License as published by the @@ -18,7 +18,7 @@ srcdir = .. include $(srcdir)/Makefile.env -pck_tools := autoupdate-perl_modules extract-specs kde4-flist2rpmvars +pck_tools := autoupdate-perl_modules extract-specs pck_tools_infiles := $(wildcard *.in) all: diff --git a/tools/kde4-flist2rpmvars.in b/tools/kde4-flist2rpmvars.in deleted file mode 100644 index 50f5448..0000000 --- a/tools/kde4-flist2rpmvars.in +++ /dev/null @@ -1,137 +0,0 @@ -#!/bin/bash -# $0 -- translate the list of files generated by rpm in a list suitable for -# inclusion into a specfile (kde4 only) -# Copyright (C) 2008-2010 Davide Madrisan -# -# This program is free software; you can redistribute it and/or modify it under -# the terms of the GNU General Public License version 2 as published by the -# Free Software Foundation. There is NO warranty; not even for MERCHANTABILITY -# or FITNESS FOR A PARTICULAR PURPOSE. -# -# Report bugs to - -[ -z "$BASH" ] || [ ${BASH_VERSION:0:1} -lt 2 ] && - echo $"this script requires bash version 2 or better" >&2 && exit 1 - -me=(${0##*/} "0.3.1") - -[ -r @libdir@/libmsgmng.lib ] || - { echo "$me: "$"library not found"": @libdir@/libmsgmng.lib" 1>&2 - exit 1; } - -. @libdir@/libmsgmng.lib - -# FIXME: add a po file for this script -#if [[ -z "$LANG" && -r /etc/sysconfig/i18n ]]; then -# . /etc/sysconfig/i18n -# export LANG -#fi -#TEXTDOMAIN="@package@"; export TEXTDOMAIN - -# default values -let "nospaces = 1" -sed_extra_mask="s,^[ \t]*,," - -function version() { - echo "\ -$me, "$"version"" ${me[1]}"" -"$"Get the specfiles from a local repository."" -Copyright (C) 2008 Davide Madrisan " -} - -function copying() { - echo "\ -"$"This program is free software; you can redistribute it and/or modify it under -the terms of the GNU General Public License version 2 as published by the -Free Software Foundation. There is NO warranty; not even for MERCHANTABILITY -or FITNESS FOR A PARTICULAR PURPOSE." -} - -function usage() { - # $1: optional exit code (default is '1') - version - echo " -"$"Usage":" - $me [-s] - -"$"where the above options mean":" - -s, --spaces "$"Do not remove extra-spaces"" - -"$"Operation modes":" - -h, --help "$"Print this help, then exit"" - -v, --version "$"Print version number, then exit"" - -"$"Some examples":" - $me /tmp/kompare4_filelist - -"$"Report bugs to .""" - - exit ${1:-1} -} - -[ $# -eq 0 ] && usage - -TEMP=`LC_ALL=C getopt \ - -o shv \ - --long nospaces,help,version \ - -n "$me" -- "$@"` -[[ $? = 0 ]] || exit 1 - -eval set -- "$TEMP" - -while :; do - case $1 in - -s|--nospaces) - let "nospaces = 0" - sed_extra_mask="";; - -h|--help) - usage 0 ;; - -v|--version) - version; echo; copying; exit 0;; - --) shift; break ;; - *) notify.error $"(bug)"" -- "$"\`getopt' error" - esac - shift -done - -flist="$1" -[[ -r "$flist" ]] || notify.error $"file not found"": \`$flist'" - -# see: /etc/rpm/macros.kde4 -cat $flist | \ -while read line; do - echo $line | sed "\ -$sed_extra_mask -s,/etc/opt/kde,%{_kde4_sysconfdir}, -s,/opt/kde/bin,%{_kde4_bindir}, -s,/opt/kde/sbin,%{_kde4_sbindir}, -\ -s,/opt/kde/include,%{_kde4_includedir}, -\ -s,/opt/kde/lib/kde4/libexec,%{_kde4_libexecdir}, -s,/opt/kde/lib/kde4/plugins,%{_kde4_pluginsdir}, -s,/opt/kde/lib,%{_kde4_libdir}, -\ -s,/opt/kde/share/applications,%{_kde4_xdgappsdir}, -s,/opt/kde/share/apps/kconf_update,%{_kde4_kconfupdatedir}, -s,/opt/kde/share/apps,%{_kde4_datadir}, -s,/opt/kde/share/autostart,%{_kde4_autostartdir}, -s,/opt/kde/share/config.kcfg,%{_kde4_kcfgdir}, -s,/opt/kde/share/config,%{_kde4_configdir}, -s,/opt/kde/share/dbus-1/interfaces,%{_kde4_dbusinterfacesdir}, -s,/opt/kde/share/dbus-1/services,%{_kde4_dbusservicesdir}, -s,/opt/kde/share/desktop-directories,%{_kde4_xdgdirectorydir}, -s,/opt/kde/share/doc/HTML,%{_kde4_htmldir}, -s,/opt/kde/share/icons,%{_kde4_icondir}, -s,/opt/kde/share/kde4/services,%{_kde4_servicesdir}, -s,/opt/kde/share/kde4/servicetypes,%{_kde4_servicetypesdir}, -s,/opt/kde/share/locale,%{_kde4_localedir}, -s,/opt/kde/share/mime/packages,%{_kde4_xdgmimedir}, -s,/opt/kde/share/mimelnk,%{_kde4_mimedir}, -s,/opt/kde/share/sounds,%{_kde4_soundsdir}, -s,/opt/kde/share/templates,%{_kde4_templatesdir}, -s,/opt/kde/share/wallpapers,%{_kde4_wallpaperdir}, -s,/opt/kde/share,%{_kde4_sharedir}, -#s,/opt/kde,%{_kde4_prefix}, -" -done | sort