scm-commits October 2012

scm-commits@lists.fedoraproject.org

453 participants
22374 discussions

[gnome-shell] Rebuild against latest telepathy-logger
by Brian Pepple 31 Oct '12

31 Oct '12

commit 4e40bbbd25e8510f7b0c3f702c7f1c0d6b7905d3 Author: Brian Pepple <bpepple(a)fedoraproject.org> Date: Wed Oct 31 18:51:12 2012 -0400 Rebuild against latest telepathy-logger gnome-shell.spec | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) --- diff --git a/gnome-shell.spec b/gnome-shell.spec index edb318d..ea7ffe0 100644 --- a/gnome-shell.spec +++ b/gnome-shell.spec @@ -1,6 +1,6 @@ Name: gnome-shell Version: 3.6.1 -Release: 4%{?dist} +Release: 5%{?dist} Summary: Window management and application launching for GNOME Group: User Interface/Desktops @@ -163,6 +163,9 @@ glib-compile-schemas --allow-any-name %{_datadir}/glib-2.0/schemas &> /dev/null %exclude %{_datadir}/gtk-doc %changelog +* Wed Oct 31 2012 Brian Pepple <bpepple(a)fedoraproject.org> - 3.6.1-5 +- Rebuild against latest telepathy-logger + * Thu Oct 25 2012 Milan Crha <mcrha(a)redhat.com> - 3.6.1-4 - Rebuild against newer evolution-data-server

1 0

[bcfg2] %files section updated
by Fabian Affolter 31 Oct '12

31 Oct '12

commit fd10a8893c3932c212a7d9aff785a6ee544b6f2a Author: Fabian Affolter <mail(a)fabian-affolter.ch> Date: Wed Oct 31 23:45:59 2012 +0100 %files section updated bcfg2.spec | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) --- diff --git a/bcfg2.spec b/bcfg2.spec index 8db6844..088b8fb 100644 --- a/bcfg2.spec +++ b/bcfg2.spec @@ -358,6 +358,8 @@ rm -rf %{buildroot} %{_sbindir}/bcfg2-* %dir %{_var}/lib/bcfg2 %{python_sitelib}/Bcfg2/Server +%{python_sitelib}/Bcfg2/Compat.* +%{python_sitelib}/Bcfg2/version.* %files web %defattr(-,root,root,-)

1 0

[bcfg2] Folder renamed for web subpackage
by Fabian Affolter 31 Oct '12

31 Oct '12

commit b810aab2c88d2fd36a9d50be90e64e5018d31877 Author: Fabian Affolter <mail(a)fabian-affolter.ch> Date: Wed Oct 31 23:37:17 2012 +0100 Folder renamed for web subpackage bcfg2.spec | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) --- diff --git a/bcfg2.spec b/bcfg2.spec index 721071b..8db6844 100644 --- a/bcfg2.spec +++ b/bcfg2.spec @@ -335,11 +335,15 @@ rm -rf %{buildroot} %dir %{python_sitelib}/Bcfg2 %{python_sitelib}/Bcfg2/__init__.* %{python_sitelib}/Bcfg2/Client +%{python_sitelib}/Bcfg2/Cache.* +%{python_sitelib}/Bcfg2/Compat.* +%{python_sitelib}/Bcfg2/Encryption.* %{python_sitelib}/Bcfg2/Logger.* %{python_sitelib}/Bcfg2/Options.* %{python_sitelib}/Bcfg2/Proxy.* %{python_sitelib}/Bcfg2/SSLServer.* %{python_sitelib}/Bcfg2/Statistics.* +%{python_sitelib}/Bcfg2/version.* %files server %defattr(-,root,root,-) @@ -359,6 +363,9 @@ rm -rf %{buildroot} %defattr(-,root,root,-) %{_datadir}/bcfg2/reports.wsgi %{_datadir}/bcfg2/site_media +%{python_sitelib}/Bcfg2/Reporting +%{python_sitelib}/Bcfg2/manage.* +%{python_sitelib}/Bcfg2/settings.* %config(noreplace) %{apache_conf}/conf.d/wsgi_bcfg2.conf %files doc

1 0

[python-glue/f18] Update to upstream version 0.2.8.1
by Lorenzo Gil Sánchez 31 Oct '12

31 Oct '12

Summary of changes: aba3b58... Update to upstream version 0.2.8.1 (*) (*) This commit already existed in another branch; no separate mail sent

1 0

[environment-modules] Updated createmodule.sh, added createmodule.py, can handle path prefixes
by Orion Poplawski 31 Oct '12

31 Oct '12

commit b16484ef6012e8a8e5232131048ea1ba4d9f7543 Author: Orion Poplawski <orion(a)nwra.com> Date: Wed Oct 31 16:12:22 2012 -0600 Updated createmodule.sh, added createmodule.py, can handle path prefixes environment-modules.spec | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) --- diff --git a/environment-modules.spec b/environment-modules.spec index 8fa085e..f8155f0 100644 --- a/environment-modules.spec +++ b/environment-modules.spec @@ -1,6 +1,6 @@ Name: environment-modules Version: 3.2.9c -Release: 4%{?dist} +Release: 5%{?dist} Summary: Provides dynamic modification of a user's environment Group: System Environment/Base @@ -9,6 +9,7 @@ URL: http://modules.sourceforge.net/ Source0: http://downloads.sourceforge.net/modules/modules-%{version}.tar.bz2 Source1: modules.sh Source2: createmodule.sh +Source3: createmodule.py Patch0: environment-modules-3.2.7-bindir.patch # Patch to fix segfault in module unload due to Tcl RegExp handling # https://bugzilla.redhat.com/show_bug.cgi?id=834580 @@ -67,7 +68,7 @@ rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/profile.d cp -p %SOURCE1 $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/modules.sh -cp -p %SOURCE2 $RPM_BUILD_ROOT%{_datadir}/Modules/bin +cp -p %SOURCE2 %SOURCE3 $RPM_BUILD_ROOT%{_datadir}/Modules/bin ln -s %{_datadir}/Modules/init/csh $RPM_BUILD_ROOT%{_sysconfdir}/profile.d/modules.csh mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/modulefiles @@ -97,6 +98,9 @@ make test %changelog +* Wed Oct 31 2012 Orion Poplawski <orion(a)cora.nwra.com> - 3.2.9c-5 +- Updated createmodule.sh, added createmodule.py, can handle path prefixes + * Fri Aug 24 2012 Orion Poplawski <orion(a)cora.nwra.com> - 3.2.9c-4 - Add patch to fix segfault from Tcl RexExp handling (bug 834580)

1 0

[environment-modules] Updated createmodule.sh and added createmodule.py
by Orion Poplawski 31 Oct '12

31 Oct '12

commit 9c1d7d90122e1ea49eab32ac855598d3ebce4a7d Author: Orion Poplawski <orion(a)nwra.com> Date: Wed Oct 31 16:10:14 2012 -0600 Updated createmodule.sh and added createmodule.py createmodule.py | 186 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ createmodule.sh | 149 +++++++++++++++++++++++++++++++------------ 2 files changed, 293 insertions(+), 42 deletions(-) --- diff --git a/createmodule.py b/createmodule.py new file mode 100755 index 0000000..60c6ba7 --- /dev/null +++ b/createmodule.py @@ -0,0 +1,186 @@ +#!/usr/bin/python +# +# createmodule.py - Takes the name of a environment init script and +# produces a modulefile that duplicates the changes made by the init script +# +# Copyright (C) 2012 by Orion E. Poplawski <orion(a)cora.nwra.com> +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 2 of the License, or +# (at your option) any later version. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. + +# You should have received a copy of the GNU General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. + +from optparse import OptionParser +import os,sys +from subprocess import * + +# Handle options +usage = "Usage: %prog [-p prefix] <initscript> [args]" +parser = OptionParser() +parser.set_usage(usage) +parser.add_option('-p', '--prefix', dest='prefix', help='Specify path prefix') +(options, args) = parser.parse_args() + +# Need a script name +if not args: + parser.print_usage() + exit(1) + +# Return environment after a command +def getenv(cmd = ':'): + env = {} + p = Popen(cmd + ";env", shell=True, stdout=PIPE, stderr=PIPE) + (stdout, stderr) = p.communicate() + if p.returncode != 0: + print "EROR: Could not execute initscript:" + print "%s returned exit code %d" % (cmd, p.returncode) + print stderr + exit(1) + if stderr != '': + print "WARNING: initscript sent the following to stderr:" + print stderr + # Parse the output key=value pairs + for line in stdout.splitlines(): + try: + (var,value) = line.split('=',1) + except ValueError: + print "ERROR: Could not parse output:" + print stdout + exit(1) + env[var] = value + return env + +#Record initial environment +env1=getenv() + +#Record environment after sourcing the initscript +env2=getenv(". " + " ".join(args)) + +# Initialize our variables for storing modifications +chdir = None +appendpath = {} +prependpath = {} +setenv = {} +unsetenv = [] +pathnames = [] + +# Function to nomalize all paths in a list of paths and remove duplicate items +def normpaths(paths): + newpaths = [] + for path in paths: + normpath = os.path.normpath(path) + if normpath not in newpaths: + newpaths.append(os.path.normpath(path)) + return newpaths + +# Start with existing keys and look for changes +for key in env1.keys(): + # Test for delete + if key not in env2: + unsetenv.append(key) + continue + # No change + if env1[key] == env2[key]: + del env2[key] + continue + #Working directory change + if key == 'PWD': + chdir=os.path.normpath(env2[key]) + pathnames.append(chdir) + del env2[key] + continue + # Determine modifcations to beginning and end of the string + (prepend,append) = env2[key].split(env1[key]) + if prepend: + prependpaths = prepend.strip(':').split(':') + # LICENSE variables often include paths outside install directory + if 'LICENSE' not in key: + pathnames += prependpaths + prependpath[key] = ':'.join(normpaths(prependpaths)) + if append: + appendpaths = append.strip(':').split(':') + # LICENSE variables often include paths outside install directory + if 'LICENSE' not in key: + pathnames += appendpaths + appendpath[key] = ':'.join(normpaths(appendpaths)) + del env2[key] + +# We're left with new keys in env2 +for key in env2.keys(): + # Use prepend-path for new paths + if ('PATH' in key) or (':' in env2[key]): + prependpaths = env2[key].strip(':').split(':') + # MANPATH can have system defaults added it it wasn't previously set + # LICENSE variables often include paths outside install directory + if key != 'MANPATH' and 'LICENSE' not in key: + pathnames += prependpaths + prependpath[key] = ':'.join(normpaths(prependpaths)) + continue + # Set new variables + setenv[key] = os.path.normpath(env2[key]) + if 'LICENSE' not in key: + pathnames.append(setenv[key]) + +# Determine a prefix +prefix = None +if options.prefix: + prefix = options.prefix +else: + prefix = os.path.commonprefix(pathnames).rstrip('/') + if prefix == '': + prefix = None + +# Print out the modulefile +print "#%Module 1.0" + +# Prefix +if prefix is not None: + print "\nset prefix " + prefix + "\n" + +# Chdir +if chdir is not None: + print "chdir\t" + chdir + +# Function to format output line with tabs and substituting prefix +def formatline(item, key, value=None): + print item, + print "\t"*(2-(len(item)+1)/8), + print key, + if value is not None: + print "\t"*(3-(len(key)+1)/8), + if prefix is not None: + print value.replace(prefix,'$prefix') + else: + print value + +# Paths first, grouped by variable name +pathkeys = appendpath.keys() + prependpath.keys() +pathkeys.sort() +for key in pathkeys: + if key in prependpath: + formatline("prepend-path",key,prependpath[key]) + if key in appendpath: + formatline("append-path",key,appendpath[key]) + +# Setenv +setenvkeys = setenv.keys() +setenvkeys.sort() +if setenvkeys: + print +for key in setenvkeys: + formatline("setenv",key,setenv[key]) + +# Unsetenv +unsetenv.sort() +if unsetenv: + print +for key in unsetenv: + formatline("unsetenv",key) diff --git a/createmodule.sh b/createmodule.sh index 8b82b34..b44cf05 100755 --- a/createmodule.sh +++ b/createmodule.sh @@ -3,7 +3,7 @@ # createmodule.sh - Takes the name of a environment init script and # produces a modulefile that duplicates the changes made by the init script # -# Copyright (C) 2010 by Orion E. Poplawski +# Copyright (C) 2010-2012 by Orion E. Poplawski <orion(a)cora.nwra.com> # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -18,10 +18,29 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. -if [ -z "$1" ] -then - echo "usage: $0 <initscript> [args]" 1>&2 +usage="Usage: $0 [-p prefix] <initscript> [args]" + +usage() { + echo $usage 1>&2 exit 1 +} + +while getopts "p:" opt +do + case $opt in + p) prefix=$OPTARG; shift 2;; + *) usage;; + esac +done + +# Need a script name +[ -z "$1" ] && usage + +# Need to be a readable script +if [ ! -r "$1" ] +then + echo "ERROR: Cannot read $1" 1>&2 + exit 1 fi #Will print out array assignment list @@ -49,53 +68,99 @@ eval env2=(`printenvarray`) #Print out the modulefile echo "#%Module 1.0" +#Prefix +[ -n "$prefix" ] && echo -e "\nset prefix $prefix\n" + +#Subshell so we can sort the output +( +dedup() { + list=`mktemp` + echo $1 | sed -r -e 's,[^/]+/\.\./,,g' -e 's,[^/]+/\.\./,,g' -e 's/:/\n/g' | + while read x + do + grep -Fx ${x} $list && continue + if [ -n "$prefix" ] + then + echo $x | sed -e s,$prefix,\$prefix, + else + echo $x + fi + echo $x >> $list + done | tr '\n' : | sed -e 's/:$//' + rm $list +} + #Keys that changed for key in "${!env1[@]}" do - if [ "${env1[$key]}" != "${env2[$key]}" ] - then - #Working directory change - if [ "$key" = PWD ] - then - echo -e "chdir\t\t${env2[PWD]}" - #Test for delete - elif [ -z "${env2[$key]}" ] - then - echo -e "unsetenv\t${key}\t${env2[$key]}" - #Test for prepend - elif [ "${env2[$key]%${env1[$key]}}" != "${env2[$key]}" ] - then - added="${env2[$key]%${env1[$key]}}" - echo -e "prepend-path\t$key\t${added%:}" - #Test for append - elif [ "${env2[$key]#${env1[$key]}}" != "${env2[$key]}" ] + if [ "${env1[$key]}" != "${env2[$key]}" ] + then + #Working directory change + if [ "$key" = PWD ] + then + if [ -n "$prefix" ] then - added="${env2[$key]#${env1[$key]}}" - echo -e "append-path\t$key\t${added#:}" + echo -e "chdir\t\t${env2[PWD]}" | sed -e s,$prefix,\$prefix,g else - #Unhandled - echo "Unhandled change of $key" 1>&2 - echo "Before <${env1[$key]}>" 1>&2 - echo "After <${env2[$key]}>" 1>&2 + echo -e "chdir\t\t${env2[PWD]}" fi - fi - #Delete keys we've handled - unset env1[$key] - unset env2[$key] + #Test for delete + elif [ -z "${env2[$key]}" ] + then + echo -e "unsetenv\t${key}\t${env2[$key]}" + #Test for prepend + elif [ "${env2[$key]%${env1[$key]}}" != "${env2[$key]}" ] + then + added=$(dedup ${env2[$key]%:${env1[$key]}}) + echo -e "prepend-path\t$key\t${added}" + #Test for prepend plus : added at end (MANPATH) + elif [ "${env2[$key]%${env1[$key]}:}" != "${env2[$key]}" ] + then + added=$(dedup ${env2[$key]%${env1[$key]}:}) + echo -e "prepend-path\t$key\t${added}" + #Test for append + elif [ "${env2[$key]#${env1[$key]}}" != "${env2[$key]}" ] + then + added=$(dedup ${env2[$key]#:${env1[$key]}}) + echo -e "append-path\t$key\t${added}" + #Test for prepend plus append + elif [ "${env2[$key]%${env1[$key]}:*}" != "${env2[$key]}" ] + then + added=$(dedup ${env2[$key]%:${env1[$key]}*}) + echo -e "prepend-path\t$key\t${added}" + added=$(dedup ${env2[$key]#*${env1[$key]}:}) + echo -e "append-path\t$key\t${added}" + else + #Unhandled + echo "Unhandled change of $key" 1>&2 + echo "Before <${env1[$key]}>" 1>&2 + echo "After <${env2[$key]}>" 1>&2 + fi + fi + #Delete keys we've handled + unset env1[$key] + unset env2[$key] done #New keys for key in "${!env2[@]}" do - if [ "$key" = OLDPWD ] - then - continue - fi - #Use prepend-path for new paths - if [ "${key/PATH/}" != "$key" ] - then - echo -e "prepend-path\t${key}\t${env2[$key]}" - else - echo -e "setenv\t\t${key}\t${env2[$key]}" - fi + if [ "$key" = OLDPWD ] + then + continue + fi + #Use prepend-path for new paths + if [ "${key/PATH/}" != "$key" ] + then + # TODO - Need to handle stripping of default MANPATH + echo -e "prepend-path\t${key}\t"$(dedup ${env2[$key]}) + else + if [ -n "$prefix" ] + then + echo -e "setenv\t\t${key}\t${env2[$key]}" | sed -e s,$prefix,\$prefix,g + else + echo -e "setenv\t\t${key}\t${env2[$key]}" + fi + fi done +) | sort

1 0

[python-glue/f17] Update to upstream version 0.2.8.1
by Lorenzo Gil Sánchez 31 Oct '12

31 Oct '12

Summary of changes: aba3b58... Update to upstream version 0.2.8.1 (*) (*) This commit already existed in another branch; no separate mail sent

1 0

[python-glue] Update to upstream version 0.2.8.1
by Lorenzo Gil Sánchez 31 Oct '12

31 Oct '12

commit aba3b5850f810d0911c5d8d2dde251ba61583473 Author: Lorenzo Gil Sanchez <lorenzo.gil.sanchez(a)gmail.com> Date: Wed Oct 31 23:00:58 2012 +0100 Update to upstream version 0.2.8.1 .gitignore | 1 + python-glue.spec | 8 +++++--- sources | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) --- diff --git a/.gitignore b/.gitignore index 4598f1b..8101d4d 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ /glue-0.2.7.tar.gz +/glue-0.2.8.1.tar.gz diff --git a/python-glue.spec b/python-glue.spec index 76e66d9..c80dad4 100644 --- a/python-glue.spec +++ b/python-glue.spec @@ -1,11 +1,11 @@ Name: python-glue -Version: 0.2.7 -Release: 2%{?dist} +Version: 0.2.8.1 +Release: 1%{?dist} Summary: A simple command line tool to generate CSS sprites License: BSD URL: http://github.com/jorgebastida/glue -Source0: http://pypi.python.org/packages/source/g/glue/glue-0.2.7.tar.gz +Source0: http://pypi.python.org/packages/source/g/glue/glue-0.2.8.1.tar.gz # This patch removes the Pillow dependency since in Fedora we have # the python-imaging package which does the same exact thing. Patch0: python-glue-0.2.7-remove-pillow-dependency.patch @@ -46,6 +46,8 @@ sed -i -e "1d" glue.py %changelog +* Wed Oct 31 2012 Lorenzo Gil Sanchez <lorenzo.gil.sanchez(a)gmail.com> - 0.2.8.1-1 +- Update to upstream version 0.2.8.1 * Tue Oct 23 2012 Lorenzo Gil Sanchez <lorenzo.gil.sanchez(a)gmail.com> - 0.2.7-2 - Remove the shebang part of the glue.py script - Remove the glue.egg-info directory in the prep section diff --git a/sources b/sources index ebbf9e4..cd76e8f 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b1fce26f963671bc69402d8d144c9482 glue-0.2.7.tar.gz +26f929ece5747f2bab2e76ec7734dd87 glue-0.2.8.1.tar.gz

1 0

[bcfg2] Examples path added
by Fabian Affolter 31 Oct '12

31 Oct '12

commit 9a8fd7dfb73438de20fb67948c59c117ec92a59e Author: Fabian Affolter <mail(a)fabian-affolter.ch> Date: Wed Oct 31 22:30:13 2012 +0100 Examples path added bcfg2.spec | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) --- diff --git a/bcfg2.spec b/bcfg2.spec index 2beb70c..721071b 100644 --- a/bcfg2.spec +++ b/bcfg2.spec @@ -200,8 +200,10 @@ mv build/sphinx/html/* %{buildroot}%{_defaultdocdir}/bcfg2-doc-%{version}%{?_pre #mv build/dtd %{buildroot}%{_defaultdocdir}/bcfg2-doc-%{version}/ # Examples -mkdir -p %{buildroot}%{_defaultdocdir}/bcfg2-examples-%{version} -mv examples %{buildroot}%{_defaultdocdir}/bcfg2-examples-%{version}/ +#mkdir -p %{buildroot}%{_defaultdocdir}/bcfg2-examples-%{version} +#mv examples %{buildroot}%{_defaultdocdir}/bcfg2-examples-%{version}/ +mkdir -p %{buildroot}%{_defaultdocdir}/bcfg2-examples-%{version}%{?_pre:pre%{_pre}} +mv examples %{buildroot}%{_defaultdocdir}/bcfg2-examples-%{version}%{?_pre:pre%{_pre}}/ %clean rm -rf %{buildroot}

1 0

[bcfg2] Obsolete stuff removed
by Fabian Affolter 31 Oct '12

31 Oct '12

commit a1d759b762866f1744588065a12a1a6d34c0628f Author: Fabian Affolter <mail(a)fabian-affolter.ch> Date: Wed Oct 31 22:27:16 2012 +0100 Obsolete stuff removed bcfg2.spec | 2 -- 1 files changed, 0 insertions(+), 2 deletions(-) --- diff --git a/bcfg2.spec b/bcfg2.spec index 1845683..2beb70c 100644 --- a/bcfg2.spec +++ b/bcfg2.spec @@ -333,13 +333,11 @@ rm -rf %{buildroot} %dir %{python_sitelib}/Bcfg2 %{python_sitelib}/Bcfg2/__init__.* %{python_sitelib}/Bcfg2/Client -%{python_sitelib}/Bcfg2/Component.* %{python_sitelib}/Bcfg2/Logger.* %{python_sitelib}/Bcfg2/Options.* %{python_sitelib}/Bcfg2/Proxy.* %{python_sitelib}/Bcfg2/SSLServer.* %{python_sitelib}/Bcfg2/Statistics.* -%{python_sitelib}/Bcfg2/Bcfg2Py3k.* %files server %defattr(-,root,root,-)

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

scm-commits October 2012