From 6afb87e7c63cf35924da746b6d01d44658b1287b Mon Sep 17 00:00:00 2001 From: Bruno Cornec Date: Wed, 10 Apr 2019 02:32:23 +0200 Subject: [PATCH] Remove pb 0.14 conf files now useless Change-Id: I40c035731637ca89333068f6f3f20aa2757601ed --- pbconf/pbfilter/all.pbf | 72 ------------------ pbconf/pbfilter/centos.pbf | 33 -------- pbconf/pbfilter/deb.pbf | 23 ------ pbconf/pbfilter/debian.pbf | 11 --- pbconf/pbfilter/fedora.pbf | 29 ------- pbconf/pbfilter/md.pbf | 11 --- pbconf/pbfilter/novell.pbf | 8 -- pbconf/pbfilter/opensuse.pbf | 10 --- pbconf/pbfilter/pkg.pbf | 8 -- pbconf/pbfilter/rpm.pbf | 34 --------- pbconf/pbfilter/ubuntu.pbf | 11 --- pbconf/python-redfish.pb | 141 ----------------------------------- 12 files changed, 391 deletions(-) delete mode 100644 pbconf/pbfilter/all.pbf delete mode 100644 pbconf/pbfilter/centos.pbf delete mode 100644 pbconf/pbfilter/deb.pbf delete mode 100644 pbconf/pbfilter/debian.pbf delete mode 100644 pbconf/pbfilter/fedora.pbf delete mode 100644 pbconf/pbfilter/md.pbf delete mode 100644 pbconf/pbfilter/novell.pbf delete mode 100644 pbconf/pbfilter/opensuse.pbf delete mode 100644 pbconf/pbfilter/pkg.pbf delete mode 100644 pbconf/pbfilter/rpm.pbf delete mode 100644 pbconf/pbfilter/ubuntu.pbf delete mode 100644 pbconf/python-redfish.pb diff --git a/pbconf/pbfilter/all.pbf b/pbconf/pbfilter/all.pbf deleted file mode 100644 index 637520c..0000000 --- a/pbconf/pbfilter/all.pbf +++ /dev/null @@ -1,72 +0,0 @@ -# -# $Id$ -# -# Filter for all files -# -# -# PBREPO is replaced by the root URL to access the repository -filter PBREPO = $pb->{'repo'} - -# PBSRC is replaced by the source package location after the repo -filter PBSRC = src/%{name}-%{version}$pb->{'extdir'}.tar.gz - -# PBVER is replaced by the version ($pb->{'ver'} in code) -filter PBVER = $pb->{'ver'} - -# PBDATE is replaced by the date ($pb->{'date'} in code) -filter PBDATE = $pb->{'date'} - -# PBEXTDIR is replaced by the testdir extension if needed ($pb->{'extdir'} in code) -filter PBEXTDIR = $pb->{'extdir'} - -# PBPATCHSRC is replaced by the patches names if value is yes. Patches are located under the pbpatch dir of the pkg. -#filter PBPATCHSRC = yes - -# PBPATCHCMD is replaced by the patches commands if value is yes -#filter PBPATCHCMD = yes - -# PBMULTISRC is replaced by the sources names if value is yes. Sources are located under the pbsrc dir of the pkg. -#filter PBMULTISRC = yes - -# PBTAG is replaced by the tag ($pb->{'tag'} in code) -filter PBTAG = $pb->{'tag'} - -# PBREV is replaced by the revision ($pb->{'rev'} in code) -filter PBREV = $pb->{'rev'} - -# PBREALPKG is replaced by the package name ($pb->{'realpkg'} in code) -filter PBREALPKG = $pb->{'realpkg'} - -# PBPKG is replaced by the package name ($pb->{'pkg'} in code) -filter PBPKG = $pb->{'pkg'} - -# PBPROJ is replaced by the project name ($pb->{'proj'} in code) -filter PBPROJ = $pb->{'proj'} - -# PBPACKAGER is replaced by the packager name ($pb->{'packager'} in code) -filter PBPACKAGER = $pb->{'packager'} - -# PBDESC contains the description of the package -filter PBDESC = The Redfish API supports dialoging with a Redfish compliant$/system such as defined by http://www.redfishcertification.org -# with a trailing , the variable can be multi-line. -# only the trailing 's will be removed, the leading spaces, -# trailing spaces, and newlines will remain except on the -# last line. You can use dollar slash as a way to introduce carriage -# return (perl syntax). -# You can use transform e.g. in rpm.pbf to adjust spaces - -# PBSUMMARY contains a short single line description of the package -filter PBSUMMARY = Redfish python library - -# PBURL contains the URL of the Web site of the project -filter PBURL = https://review.openstack.org/#/q/project:openstack/python-redfish - -# PBLOG is replaced by the changelog if value is yes -# and should be last as when used we need the %pb hash filled -filter PBLOG = yes - -filter PBCONFFILE = /etc/redfish-client.conf -filter PBSHAREPATH = /usr/share/redfish-client -filter PBPYTHON3FILTER = perl -pi -e "s|configparser>=3.3.0; python_version < '3'|configparser>=3.3.0|" requirements.txt -# By default build for python3 -filter PBWITHPY3 = 1 diff --git a/pbconf/pbfilter/centos.pbf b/pbconf/pbfilter/centos.pbf deleted file mode 100644 index ddb7d8c..0000000 --- a/pbconf/pbfilter/centos.pbf +++ /dev/null @@ -1,33 +0,0 @@ -# -# $Id$ -# -# Filter for rpm build -# - -# PBGRP is replaced by the RPM group of apps -# Cf: http://fedoraproject.org/wiki/RPMGroups -#filter PBGRP = Applications/Archiving - -# PBLIC is replaced by the license of the application -# Cf: http://fedoraproject.org/wiki/Licensing -#filter PBLIC = GPLv2+ - -# PBDEP is replaced by the list of dependencies -#filter PBDEP = - -# PBBDEP is replaced by the list of build dependencies -#filter PBBDEP = - -# PBSUF is replaced by the package suffix ($pb->{'suf'} in code) -filter PBSUF = %{dist} - -# PBOBS is replaced by the Obsolete line -#filter PBOBS = - -filter PB2PYTHON2BDEP = python-sphinx >= 1.2.3 -filter PB2PYTHON3BDEP = python3-sphinx >= 1.2.3 -# Needed as pb doesn't interpret spec macros -filter PBPYTHON3BDEP = -filter PBPYTHON3DEP = -filter PBPYTHONDOCBDEP = python2-sphinx-theme-alabaster,python-snowballstemmer,texlive-multirow,texlive-upquote,texlive-wrapfig,texlive-threeparttable,texlive-titlesec,texlive-framed,,texlive-latex-bin,texlive-hyphen-base,texlive-cm,texlive-cmap,texlive-ec,texlive-fancyhdr,texlive-fancybox,texlive-mdwtools,texlive-parskip -filter PBWITHPY3 = 0 diff --git a/pbconf/pbfilter/deb.pbf b/pbconf/pbfilter/deb.pbf deleted file mode 100644 index 5972692..0000000 --- a/pbconf/pbfilter/deb.pbf +++ /dev/null @@ -1,23 +0,0 @@ -# -# $Id$ -# -# Filter for debian build -# -# PBGRP is replaced by the group of apps -filter PBGRP = utils - -# PBLIC is replaced by the license of the application -# Cf: http://www.debian.org/legal/licenses/ -filter PBLIC = ASL 2.0 - -# PBDEP is replaced by the list of dependencies -filter PBDEP = python-docopt, python-tortilla, python-jinja2, python-pbr, python-docopt, python-simplejson - -# PBBDEP is replaced by the list of build dependencies -filter PBBDEP = python-dev, python-setuptools, python-pbr, python-tortilla, python-jinja2, python-sphinx - -# PBSUG is replaced by the list of suggestions -#filter PBSUG = - -# PBREC is replaced by the list of recommandations -#filter PBREC = diff --git a/pbconf/pbfilter/debian.pbf b/pbconf/pbfilter/debian.pbf deleted file mode 100644 index 2fa6292..0000000 --- a/pbconf/pbfilter/debian.pbf +++ /dev/null @@ -1,11 +0,0 @@ -# -# $Id$ -# -# Filter for debian build -# -# PBDEBSTD is replaced by the Debian standard version -filter PBDEBSTD = 3.8.0 - -# PBDEBCOMP is replaced by the Debian Compatibility value -filter PBDEBCOMP = 7 - diff --git a/pbconf/pbfilter/fedora.pbf b/pbconf/pbfilter/fedora.pbf deleted file mode 100644 index a46e5ef..0000000 --- a/pbconf/pbfilter/fedora.pbf +++ /dev/null @@ -1,29 +0,0 @@ -# -# $Id$ -# -# Filter for rpm build -# - -# PBGRP is replaced by the RPM group of apps -# Cf: http://fedoraproject.org/wiki/RPMGroups -#filter PBGRP = Applications/Archiving - -# PBLIC is replaced by the license of the application -# Cf: http://fedoraproject.org/wiki/Licensing -#filter PBLIC = GPLv2+ - -# PBDEP is replaced by the list of dependencies -#filter PBDEP = - -# PBBDEP is replaced by the list of build dependencies -#filter PBBDEP = - -# PBSUF is replaced by the package suffix ($pb->{'suf'} in code) -filter PBSUF = %{dist} - -# PBOBS is replaced by the Obsolete line -#filter PBOBS = - -filter PB2PYTHON2BDEP = python-sphinx >= 1.2.3 -filter PB2PYTHON3BDEP = python3-sphinx >= 1.2.3 -filter PBPYTHONDOCBDEP = texlive-multirow,texlive-upquote,texlive-wrapfig,texlive-threeparttable,texlive-titlesec,texlive-framed,texlive-capt-of,texlive-latex-bin,texlive-hyphen-base,texlive-cm,texlive-cmap,texlive-ec,texlive-langcode,texlive-babel-english,texlive-fancyhdr,texlive-fancybox,texlive-mdwtools,texlive-parskip,texlive-eqparbox,texlive-times,texlive-helvetic,texlive-courier,texlive-gsftopk-bin,texlive-dvips,texlive-mfware-bin diff --git a/pbconf/pbfilter/md.pbf b/pbconf/pbfilter/md.pbf deleted file mode 100644 index e5e6a6d..0000000 --- a/pbconf/pbfilter/md.pbf +++ /dev/null @@ -1,11 +0,0 @@ -# Specific group for Mandriva for python-redfish -# Cf: http://wiki.mandriva.com/en/Development/Packaging/Groups -filter PBGRP = Development/Python - -# PBLIC is replaced by the license of the application -# Cf: http://wiki.mandriva.com/en/Development/Packaging/Licenses -#filter PBLIC = GPL - -filter PB2PYTHON2BDEP = python-pkg-resources >= 18,python-sphinx >= 1.2.3 -filter PB2PYTHON3BDEP = python3-pkg-resources >= 18,python3-sphinx >= 1.2.3 -filter PBPYTHONDOCBDEP = texlive-dist diff --git a/pbconf/pbfilter/novell.pbf b/pbconf/pbfilter/novell.pbf deleted file mode 100644 index d170299..0000000 --- a/pbconf/pbfilter/novell.pbf +++ /dev/null @@ -1,8 +0,0 @@ -# Specific group for SuSE for python-redfish -# Cf: http://en.opensuse.org/SUSE_Package_Conventions/RPM_Groups -#filter PBGRP = Productivity/Archiving/Backup - -# PBLIC is replaced by the license of the application -# Cf: http://en.opensuse.org/Packaging/SUSE_Package_Conventions/RPM_Style#1.6._License_Tag -#filter PBLIC = GPL - diff --git a/pbconf/pbfilter/opensuse.pbf b/pbconf/pbfilter/opensuse.pbf deleted file mode 100644 index 0cedfc8..0000000 --- a/pbconf/pbfilter/opensuse.pbf +++ /dev/null @@ -1,10 +0,0 @@ -# Specific group for OpenSUSE for python-redfish -filter PBGRP = Development/Python - -# PBLIC is replaced by the license of the application -#filter PBLIC = GPL - -filter PB2PYTHON2BDEP = python-Sphinx >= 1.2.3,python-colorclass,python-formats -filter PB2PYTHON3BDEP = python3-Sphinx >= 1.2.3,python3-colorclass,python3-formats -filter PBPYTHONDOCBDEP = texlive-latex-bin,texlive-cmap,texlive-fancyhdr,texlive-fancybox,texlive-mdwtools,texlive-parskip,texlive-babel-english,texlive-psnfss,texlive-fncychap,texlive-titlesec,texlive-tabulary,texlive-framed,texlive-fancyvrb,texlive-threeparttable,texlive-float,texlive-wrapfig,texlive-upquote,texlive-capt-of,texlive-multirow,texlive-eqparbox,texlive-metafont-bin,texlive-helvetic,texlive-courier,texlive-dvips,texlive-times -filter PBPYTHON3FILTER = perl -pi -e "s|configparser>=3.3.0; python_version < '3'|configparser>=3.3.0|" requirements.txt$/%define py3dir %{_builddir}/python3-%{name}-%{version}-%{release}$/%define __python3 /usr/bin/python3$/%define python3_version %{py3_ver} diff --git a/pbconf/pbfilter/pkg.pbf b/pbconf/pbfilter/pkg.pbf deleted file mode 100644 index 5496d1a..0000000 --- a/pbconf/pbfilter/pkg.pbf +++ /dev/null @@ -1,8 +0,0 @@ -# -# $Id$ -# -# Filter for pkg build -# -# Solaris package name (VENDOR : 4 letters in uppercase, SOFT : 8 letters in lowercase) -filter PBSOLPKG = SUNWsoftware - diff --git a/pbconf/pbfilter/rpm.pbf b/pbconf/pbfilter/rpm.pbf deleted file mode 100644 index c05badc..0000000 --- a/pbconf/pbfilter/rpm.pbf +++ /dev/null @@ -1,34 +0,0 @@ -# -# $Id$ -# -# Filter for rpm build -# - -# PBGRP is replaced by the RPM group of apps -filter PBGRP = Applications/System - -# PBLIC is replaced by the license of the application -filter PBLIC = ASL 2.0 - -# PBDEP is replaced by the list of dependencies -#filter PBDEP = - -# PBBDEP is replaced by the list of build dependencies -filter PBPYTHON2BDEP = make,python-devel,python-setuptools >= 18,python-future >= 0.15.2,python-docopt >= 0.6.2,python-requests >= 2.9.1,python-simplejson >= 3.8.1,python-configparser >= 3.3.0,python-sphinx_rtd_theme,python-pbr >= 0.8,python-tortilla >= 0.4.1 -filter PBPYTHONDOCBDEP = texlive -filter PBPYTHON2DEP = python-docopt >= 0.6.2,python-tortilla >= 0.4.1,python-jinja2 >= 2.7.3,python-simplejson >= 3.8.1,python-requests >= 2.9.1,python-configparser >= 3.3.0,python-future >= 0.15.2 -filter PBPYTHON3BDEP = python3-devel,python3-setuptools >= 18,python3-future >= 0.15.2,python3-docopt >= 0.6.2,python3-requests >= 2.9.1,python3-simplejson >= 3.8.1,python3-sphinx_rtd_theme,python3-pbr >= 0.8,python3-tortilla >= 0.4.1 -filter PBPYTHON3DEP = python3-docopt >= 0.6.2,python3-tortilla >= 0.4.1,python3-jinja2 >= 2.7.3,python3-simplejson >= 3.8.1,python3-requests >= 2.9.1 -filter PBPYTHON3PKG = python3-redfish - -# PBSUF is replaced by the package suffix ($pb->{'suf'} in code) -filter PBSUF = $pb->{'suf'} - -# PBOBS is replaced by the Obsolete line -#filter PBOBS = - -# transform a variable from the key on the right to the key on the left using the perl expression -# after the input key name. Useful for taking multi-line documentation and removing trailing spaces -# or leading spaces. -#transform PBDESC = PBDESC_raw s/\s+\n/\n/go; - diff --git a/pbconf/pbfilter/ubuntu.pbf b/pbconf/pbfilter/ubuntu.pbf deleted file mode 100644 index 3133ad3..0000000 --- a/pbconf/pbfilter/ubuntu.pbf +++ /dev/null @@ -1,11 +0,0 @@ -# -# $Id$ -# -# Filter for ubuntu build -# -# PBDEBSTD is replaced by the Debian standard version -filter PBDEBSTD = 3.8.3 - -# PBDEBCOMP is replaced by the Debian Compatibility value -filter PBDEBCOMP = 7 - diff --git a/pbconf/python-redfish.pb b/pbconf/python-redfish.pb deleted file mode 100644 index 0305d1d..0000000 --- a/pbconf/python-redfish.pb +++ /dev/null @@ -1,141 +0,0 @@ -# -# Project Builder configuration file -# For project python-redfish -# -# $Id$ -# - -# -# What is the project URL -# -#pburl python-redfish = svn://svn.python-redfish.org/python-redfish/devel -#pburl python-redfish = svn://svn+ssh.python-redfish.org/python-redfish/devel -#pburl python-redfish = cvs://cvs.python-redfish.org/python-redfish/devel -#pburl python-redfish = http://www.python-redfish.org/src/python-redfish-devel.tar.gz -#pburl python-redfish = ftp://ftp.python-redfish.org/src/python-redfish-devel.tar.gz -#pburl python-redfish = file:///src/python-redfish-devel.tar.gz -#pburl python-redfish = dir:///src/python-redfish-devel -pburl python-redfish = git+https://review.openstack.org/p/openstack/python-redfish.git - -# Repository -pbrepo python-redfish = ftp://ftp.mondorescue.org -pbml python-redfish = python-redfish@mondorescue.org -pbsmtp python-redfish = localhost -# For distro supporting it, which area is used -#projcomponent python-redfish = main - -# Check whether project is well formed -# when downloading from ftp/http/... -# (containing already a directory with the project-version name) -pbwf python-redfish = 1 - -# Do we check GPG keys -pbgpgcheck python-redfish = 1 - -# -# Packager label -# -pbpackager python-redfish = Bruno Cornec -# - -# For delivery to a machine by SSH (potentially the FTP server) -# Needs hostname, account and directory -# -sshhost python-redfish = www.mondorescue.org -sshlogin python-redfish = bruno -sshdir python-redfish = /prj/ftp -sshport python-redfish = 22 -# - -# -# For Virtual machines management -# Naming convention to follow: distribution name (as per ProjectBuilder::Distribution) -# followed by '-' and by release number -# followed by '-' and by architecture -# a .vmtype extension will be added to the resulting string -# a QEMU rhel-3-i286 here means that the VM will be named rhel-3-i386.qemu -# -vmlist python-redfish = opensuse-12.3-i386,debian-8-i386,ubuntu-16.04-i386,mageia-5-i386,mageia-5-x86_64,fedora-23-x86_64,rhel-7-x86_64,opensuse-12.3-x86_64,sles-12-x86_64,debian-8-x86_64,ubuntu-16.04-x86_64 - -# -# Valid values for vmtype are -# qemu, (vmware, xen, ... TBD) -#vmtype python-redfish = qemu - -# Hash for VM stuff on vmtype -#vmntp default = pool.ntp.org - -# We suppose we can commmunicate with the VM through SSH -#vmhost python-redfish = localhost -#vmlogin python-redfish = pb -#vmport python-redfish = 2222 - -# Timeout to wait when VM is launched/stopped -#vmtmout default = 120 - -# per VMs needed paramaters -#vmopt python-redfish = -m 384 -daemonize -#vmpath python-redfish = /home/qemu -#vmsize python-redfish = 5G - -# -# For Virtual environment management -# Naming convention to follow: distribution name (as per ProjectBuilder::Distribution) -# followed by '-' and by release number -# followed by '-' and by architecture -# a .vetype extension will be added to the resulting string -# a chroot rhel-3-i286 here means that the VE will be named rhel-3-i386.chroot -# -# -# Supported distribution for python-redfish -velist python-redfish = opensuse-42.2-x86_64,centos-7-x86_64,fedora-25-x86_64,debian-8-x86_64,mageia-5-x86_64,ubuntu-16.04-x86_64 - -# VE params -vetype python-redfish = docker -#ventp default = pool.ntp.org -#velogin python-redfish = pb -#vepath python-redfish = /var/cache/rpmbootstrap -#rbsconf python-redfish = /etc/mock -#verebuild python-redfish = false - -# -# Global version/tag for the project -# -projver python-redfish = 0.4.2 -projtag python-redfish = 1 - -# Hash of valid version names - -#version python-redfish = devel,stable - -# Is it a test version or a production version -testver python-redfish = true -# Which upper target dir for delivery -delivery python-redfish = test - -# Additional repository to add at build time -# addrepo centos-5-x86_64 = http://packages.sw.be/rpmforge-release/rpmforge-release-0.3.6-1.el5.rf.x86_64.rpm,ftp://ftp.project-builder.org/centos/5/pb.repo -# addrepo centos-4-x86_64 = http://packages.sw.be/rpmforge-release/rpmforge-release-0.3.6-1.el4.rf.x86_64.rpm,ftp://ftp.project-builder.org/centos/4/pb.repo -# This will allow usage of python-simplejson 1.8.1 -addrepo fedora-25-x86_64 = ftp://ftp.project-builder.org/fedora/25/x86_64/pb.repo -addrepo centos-7-x86_64 = https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm,ftp://ftp.project-builder.org/centos/7/x86_64/pb.repo -addrepo mageia-5-x86_64 = ftp://ftp.project-builder.org/mageia/5/x86_64/pb.addmedia -addrepo opensuse-42.2-x86_64 = ftp://ftp.project-builder.org/opensuse/42.2/x86_64/pb.repo,http://download.opensuse.org/repositories/devel:languages:python3/openSUSE_Leap_42.2/devel:languages:python3.repo,http://download.opensuse.org/repositories/Virtualization:containers/openSUSE_Leap_42.2/Virtualization:containers.repo,http://download.opensuse.org/repositories/devel:languages:python/openSUSE_Leap_42.2/devel:languages:python.repo - -# Adapt to your needs: -# Optional if you need to overwrite the global values above -# -#pkgver python-redfish = stable -#pkgtag python-redfish = 3 -# Hash of default package/package directory -defpkgdir python-redfish = . -# Hash of additional package/package directory -#extpkgdir minor-pkg = dir-minor-pkg - -# List of files per pkg on which to apply filters -# Files are mentioned relatively to pbroot/defpkgdir -filteredfiles python-redfish = redfish-client/redfish-client,redfish-client/redfish-check-cartridge,doc/source/conf.py,redfish-client/etc/redfish-client.conf,install.sh -#supfiles python-redfish = python-redfish.init - -# We use pbr to generate sources -pbpbr python-redfish = 1