scm-commits July 2007

scm-commits@lists.fedoraproject.org

1 participants
5444 discussions

rpms/Democracy/devel dead.package, NONE, 1.1 Democracy.spec, 1.13, NONE Makefile, 1.1, NONE sources, 1.2, NONE
by fedora-extras-commits＠redhat.com 31 Jul '07

31 Jul '07

Author: wtogami Update of /cvs/extras/rpms/Democracy/devel In directory cvs-int.fedora.redhat.com:/home/fedora/wtogami/Democracy/devel Added Files: dead.package Removed Files: Democracy.spec Makefile sources Log Message: dead package --- NEW FILE dead.package --- --- Democracy.spec DELETED --- --- Makefile DELETED --- --- sources DELETED ---

1 0

rpms/Democracy/F-7 dead.package,NONE,1.1
by fedora-extras-commits＠redhat.com 31 Jul '07

31 Jul '07

Author: wtogami Update of /cvs/extras/rpms/Democracy/F-7 In directory cvs-int.fedora.redhat.com:/home/fedora/wtogami/Democracy/F-7 Added Files: dead.package Log Message: renamed to Miro --- NEW FILE dead.package ---

1 0

rpms/rpmlint/devel rpmlint-0.80-fedoralicensing.patch, NONE, 1.1 rpmlint.config, 1.6, 1.7 rpmlint.spec, 1.29, 1.30
by fedora-extras-commits＠redhat.com 31 Jul '07

31 Jul '07

Author: scop Update of /cvs/pkgs/rpms/rpmlint/devel In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv17799 Modified Files: rpmlint.config rpmlint.spec Added Files: rpmlint-0.80-fedoralicensing.patch Log Message: Sync with F-7 rpmlint-0.80-fedoralicensing.patch: --- NEW FILE rpmlint-0.80-fedoralicensing.patch --- --- TagsCheck.py~ 2007-03-26 23:01:49.000000000 +0300 +++ TagsCheck.py 2007-07-31 23:23:08.000000000 +0300 @@ -629,11 +629,11 @@ printError(pkg, 'no-license') else: if rpm_license not in VALID_LICENSES: - licenses = re.split('(?:[- ]like|/|ish|[- ]style|[- ]Style|and|or|&|\s|-)+', rpm_license) + licenses = re.split('\s(?:and|or)\s|[()]', rpm_license) for l in licenses: + l = l.strip() if l != '' and not l in VALID_LICENSES: - printWarning(pkg, 'invalid-license', rpm_license) - break + printWarning(pkg, 'invalid-license', l) url=pkg[rpm.RPMTAG_URL] if url and url != 'none': @@ -800,9 +800,7 @@ 'invalid-license', '''The value of the License tag was not recognized. Known values are: -%s -If the license is close to an existing one, you can use '<license> style'.''' \ -% fill('"' + '", "'.join(VALID_LICENSES) + '".', 78), +%s''' % fill('"' + '", "'.join(VALID_LICENSES) + '".', 78), 'invalid-url', '''Your URL is not valid. It must begin with http, https or ftp and must no Index: rpmlint.config =================================================================== RCS file: /cvs/pkgs/rpms/rpmlint/devel/rpmlint.config,v retrieving revision 1.6 retrieving revision 1.7 diff -u -r1.6 -r1.7 --- rpmlint.config 12 Apr 2007 20:45:44 -0000 1.6 +++ rpmlint.config 31 Jul 2007 20:54:22 -0000 1.7 @@ -4,7 +4,6 @@ # options in /etc/rpmlint/config and/or ~/.rpmlintrc as needed. from Config import * -from TagsCheck import DEFAULT_VALID_LICENSES setOption("DistRegex", '\.(fc|rhe?l|el)\d+(?=\.|$)') setOption("UseVersionInChangeLog", 1) @@ -20,13 +19,113 @@ "/usr/bin/perl", "/usr/bin/python", )) + setOption("DanglingSymlinkExceptions", ( ['consolehelper$', 'usermode'], ['consolehelper-gtk$', 'usermode-gtk'], )) -setOption("ValidLicenses", - DEFAULT_VALID_LICENSES + - ("Redistributable, no modification permitted", )) + +setOption("ValidLicenses", ( + # These are the short names for all of the Fedora approved licenses. + # The master list is kept here: http://fedoraproject.org/wiki/Licensing + 'AFL', + 'Affero GPL', + 'ASL 1.0', + 'ASL 1.0+', + 'ASL 1.1', + 'ASL 1.1+', + 'ASL 2.0', + 'ASL 2.0+', + 'APSL 2.0', + 'APSL 2.0+', + 'Artistic clarified', + 'Boost', + 'BSD with advertising', + 'BSD', + 'CeCILL', + 'CDDL', + 'CPL', + 'Condor', + 'Cryptix', + 'EPL', + 'eCos', + 'EFL 2.0', + 'EFL 2.0+', + 'EU Datagrid', + 'GPL+', + 'GPLv2', + 'GPLv2+', + 'GPLv3', + 'GPLv3+', + 'IBM', + 'iMatix', + 'Intel ACPI', + 'Interbase', + 'Jabber', + 'LaTeX', + 'LGPL+', + 'LGPLv2', + 'LGPLv2 with exceptions', + 'LGPLv2+', + 'LGPLv3', + 'LGPLv3+', + 'LPL', + 'mecab-ipadic', + 'MIT', + 'MPLv1.0', + 'MPLv1.0+', + 'MPLv1.1', + 'MPLv1.1+', + 'NCSA', + 'NGPL', + 'NOSL', + 'Netscape', + 'Nokia', + 'OpenLDAP', + 'OSL 1.0', + 'OSL 1.0+', + 'OpenSSL', + 'Phorum', + 'PHP', + 'Public Domain', + 'Python', + 'QPL', + 'RPSL', + 'Ruby', + 'Sleepycat', + 'SMLNJL', + 'SISSL', + 'SPL', + 'Vim', + 'VNLSL', + 'VSL', + 'W3C', + 'wxWindows', + 'xinetd', + 'Zend', + 'ZPLv1.0', + 'ZPLv1.0+', + 'ZPLv2.0', + 'ZPLv2.0+', + 'zlib', + # Documentation licenses + 'CDL', + 'FBSDDL', + 'GFDL', + 'Open Publication', + # Content licenses + 'CC-BY', + 'CC-BY-SA', + 'DSL', + # Font licenses + 'Free Art', + 'Arphic', + 'SIL Open Font', + # Others + 'Redistributable, no modification permitted', + 'Freely redistributable without restriction', +)) + # Standard users & groups from the setup package: setOption("StandardUsers", ("root", "bin", "daemon", "adm", "lp", "sync", "shutdown", "halt", @@ -61,3 +160,4 @@ addFilter("non-standard-dir-in-usr libexec") addFilter(" gpg-pubkey ") addFilter(" doc-file-dependency .* /bin/sh$") +addFilter("hardcoded-library-path .*/lib/udev(/|$)") Index: rpmlint.spec =================================================================== RCS file: /cvs/pkgs/rpms/rpmlint/devel/rpmlint.spec,v retrieving revision 1.29 retrieving revision 1.30 diff -u -r1.29 -r1.30 --- rpmlint.spec 12 Apr 2007 20:45:44 -0000 1.29 +++ rpmlint.spec 31 Jul 2007 20:54:22 -0000 1.30 @@ -4,12 +4,13 @@ Summary: Tool for checking common errors in RPM packages Group: Development/Tools -License: GPL +License: GPLv2 URL: http://rpmlint.zarb.org/ Source0: http://rpmlint.zarb.org/download/%{name}-%{version}.tar.bz2 Source1: %{name}.config Patch0: %{name}-0.78-distregex.patch Patch1: %{name}-0.77-compile.patch +Patch2: %{name}-0.80-fedoralicensing.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch @@ -32,6 +33,7 @@ %setup -q %patch0 %patch1 +%patch2 sed -i -e /MenuCheck/d Config.py @@ -66,6 +68,12 @@ %changelog +* Tue Jul 31 2007 Tom "spot" Callaway <tcallawa(a)redhat.com> +- new fedora licensing scheme + +* Thu May 31 2007 Ville Skyttä <ville.skytta at iki.fi> +- Filter hardcoded-library-path errors for /lib/udev. + * Thu Apr 12 2007 Ville Skyttä <ville.skytta at iki.fi> - 0.80-1 - 0.80, fixes #227389, #228645, #233795. - Accept "Redistributable, no modification permitted" as a valid license.

1 0

owners owners.list,1.3446,1.3447
by fedora-extras-commits＠redhat.com 31 Jul '07

31 Jul '07

1 0

rpms/Miro/devel .cvsignore, NONE, 1.1 Makefile, NONE, 1.1 sources, NONE, 1.1
by fedora-extras-commits＠redhat.com 31 Jul '07

31 Jul '07

Author: wtogami Update of /cvs/extras/rpms/Miro/devel In directory cvs-int.fedora.redhat.com:/home/fedora/wtogami/owners/tmpcvsv17805/rpms/Miro/devel Added Files: .cvsignore Makefile sources Log Message: Setup of module Miro --- NEW FILE .cvsignore --- --- NEW FILE Makefile --- # Makefile for source rpm: Miro # $Id: Makefile,v 1.1 2007/07/31 20:54:36 wtogami Exp $ NAME := Miro SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) ifeq ($(MAKEFILE_COMMON),) # attept a checkout define checkout-makefile-common test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 endef MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) endif include $(MAKEFILE_COMMON) --- NEW FILE sources ---

1 0

rpms/Miro Makefile,NONE,1.1 import.log,NONE,1.1 pkg.acl,NONE,1.1
by fedora-extras-commits＠redhat.com 31 Jul '07

31 Jul '07

Author: wtogami Update of /cvs/extras/rpms/Miro In directory cvs-int.fedora.redhat.com:/home/fedora/wtogami/owners/tmpcvsv17805/rpms/Miro Added Files: Makefile import.log pkg.acl Log Message: Setup of module Miro --- NEW FILE Makefile --- # Top level Makefile for module Miro all : CVS/Root common-update @cvs update common-update : common @cd common && cvs update common : CVS/Root @cvs checkout common CVS/Root : @echo "ERROR: This does not look like a CVS checkout" && exit 1 clean : @find . -type f -name *~ -exec rm -fv {} \; --- NEW FILE import.log --- --- NEW FILE pkg.acl ---

1 0

rpms/Miro/devel - New directory
by fedora-extras-commits＠redhat.com 31 Jul '07

31 Jul '07

Author: wtogami Update of /cvs/extras/rpms/Miro/devel In directory cvs-int.fedora.redhat.com:/home/fedora/wtogami/owners/tmpcvsv17805/rpms/Miro/devel Log Message: Directory /cvs/extras/rpms/Miro/devel added to the repository

1 0

rpms/Miro - New directory
by fedora-extras-commits＠redhat.com 31 Jul '07

31 Jul '07

Author: wtogami Update of /cvs/extras/rpms/Miro In directory cvs-int.fedora.redhat.com:/home/fedora/wtogami/owners/tmpcvsv17805/rpms/Miro Log Message: Directory /cvs/extras/rpms/Miro added to the repository

1 0

owners owners.epel.list,1.470,1.471
by fedora-extras-commits＠redhat.com 31 Jul '07

31 Jul '07

1 0

owners owners.epel.list,1.469,1.470
by fedora-extras-commits＠redhat.com 31 Jul '07

31 Jul '07

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

scm-commits July 2007