Update packages file for version 34360

Signed-off-by: clrbuilder <clrbuilder@intel.com>
Improve detection of the debuginfo rpm
2026-06-16 19:16:00 +00:00 · 2021-03-09 00:06:34 -08:00 · 2021-03-09 06:19:40 +00:00 · 2021-03-09 06:02:10 +00:00 · 2021-03-08 22:43:34 +00:00 · 2021-03-04 00:08:35 -08:00
3 changed files with 83 additions and 103 deletions
@@ -9,13 +9,15 @@ include $(TOPLVL)/projects/common/Makefile.shared

 SHELL  = /bin/bash

+CURRENT_BRANCH := $(shell git rev-parse --abbrev-ref HEAD)
+
 SPECFILE = $(addsuffix .spec, $(PKG_NAME))

 SRPMVERS = $(shell [ ! -f $(SPECFILE) ] || $(call queryspec,%{NVR}\n,$(SPECFILE)))
 SRPMFILE = results/$(SRPMVERS).src.rpm

 LATEST_RPMS = $(wildcard rpms/*.rpm)
-DEBUGINFO_RPM = $(wildcard rpms/*-debuginfo-*.rpm)
+DEBUGINFO_RPM = $(wildcard rpms/${PKG_NAME}-debuginfo-$(shell $(call queryspec,%{V}-%{R},${SPECFILE})).*.rpm)
 RPMS ?= $(LATEST_RPMS)

 WITH_SUDO = $(shell cmp /usr/bin/mock /usr/sbin/mock &> /dev/null && echo sudo )
@@ -76,7 +78,7 @@ configemail:

 #help checkblacklist: Verify rpms files to not include banned files for Clear Linux OS.
 checkblacklist:
-	@$(TOPLVL)/projects/common/checkblacklist.sh $(TOPLVL)/projects/common/blacklist results/*.rpm
+	@$(TOPLVL)/projects/common/checkblacklist.sh $(TOPLVL)/projects/common/blacklist $(filter-out ${DEBUGINFO_RPM},${RPMS})

 prebuild-checks:

@@ -305,8 +307,8 @@ prekoji-checks:
 koji: prekoji-checks kojidef
 	@$(MAKE) spdxcheck
 	@$(MAKE) checkblacklist
-	@if [ "$$(git rev-parse --abbrev-ref HEAD)" != "master" ]; then \
-		echo "Error: Must be on the master branch to submit to koji" >&2; \
+	@if [ "$(CURRENT_BRANCH)" != "master" ] && [ "$(CURRENT_BRANCH)" != "main" ]; then \
+		echo "Error: Must be on the \"master\" or \"main\" branch to submit to koji" >&2; \
 		exit 1; \
 	fi; \
 	if ! git diff --quiet HEAD -- ${SPECFILE}; then \
@@ -322,7 +324,7 @@ koji: prekoji-checks kojidef
 		exit 1; \
 	fi
 	git tag $(SRPMVERS)
-	git push origin master refs/tags/$(SRPMVERS)
+	git push origin $(CURRENT_BRANCH):master refs/tags/$(SRPMVERS)
 	$(KOJI_CMD) build $$KOJI_NOWAIT $(KOJI_TAG) $(PKG_BASE_URL)/$(PKG_NAME)?#$(SRPMVERS)

 #help rekoji: In case a previous 'make koji' failed, trigger a rebuild for the
@@ -163,7 +163,7 @@ status: $(PACKAGES_FILE) $(addprefix packages/,$(PKGS_LOCAL))
 #help diffstat. Requires that diffstat is installed.
 diff: $(PACKAGES_FILE) $(addprefix packages/,$(PKGS_LOCAL))
 	@for p in projects/common $(addprefix packages/,$(PKGS_LOCAL)); do \
-		(cd $$p ; git status | grep -q 'nothing to commit, working [^ ]* clean' || (echo "Uncommitted changes in: $$p"; git diff |diffstat -p1)) ;\
+		(cd $$p; git status --porcelain | grep -vq '^?? ' && (echo "Uncommitted changes in: $$p"; git diff | diffstat -p1); :) ;\
 	done

 #help log: Run git log origin/master..HEAD for all package repos, thus
@@ -107,6 +107,7 @@ R-DT
 R-DendSer
 R-Deriv
 R-DescTools
+R-DiagrammeR
 R-DistributionUtils
 R-DoseFinding
 R-Ecdat
@@ -260,9 +261,11 @@ R-bridgesampling
 R-brio
 R-brms
 R-broom
+R-bslib
 R-bvls
 R-ca
 R-caTools
+R-cachem
 R-calibrate
 R-calibrator
 R-callr
@@ -293,6 +296,7 @@ R-commonmark
 R-compositions
 R-conditionz
 R-config
+R-conflicted
 R-conquer
 R-contfrac
 R-conting
@@ -303,6 +307,7 @@ R-covr
 R-cowplot
 R-cpp11
 R-crayon
+R-credentials
 R-crosstalk
 R-crul
 R-csvy
@@ -339,6 +344,7 @@ R-doParallel
 R-doRNG
 R-doSNOW
 R-dotCall64
+R-downlit
 R-downloader
 R-dplyr
 R-drc
@@ -352,6 +358,7 @@ R-eRm
 R-earth
 R-eco
 R-ecodist
+R-eddington
 R-effects
 R-eha
 R-eiPack
@@ -391,12 +398,14 @@ R-fUnitRoots
 R-fail
 R-fansi
 R-farver
+R-fastGHQuad
 R-fastICA
 R-fastcluster
 R-fastmap
 R-fastmatch
 R-fauxpas
 R-fda
+R-fds
 R-feather
 R-ff
 R-fields
@@ -415,6 +424,7 @@ R-forcats
 R-foreach
 R-forecast
 R-formatR
+R-formattable
 R-fossil
 R-fpc
 R-fracdiff
@@ -438,6 +448,7 @@ R-geiger
 R-generics
 R-geojson
 R-geometry
+R-gert
 R-getopt
 R-ggjoy
 R-ggplot2
@@ -446,6 +457,8 @@ R-ggridges
 R-ggvis
 R-gh
 R-git2r
+R-gitcreds
+R-gld
 R-glmnet
 R-globals
 R-glue
@@ -458,6 +471,7 @@ R-gower
 R-gplots
 R-gridBase
 R-gridExtra
+R-gsl
 R-gss
 R-gtable
 R-gtools
@@ -498,7 +512,9 @@ R-joineR
 R-joineRML
 R-jpeg
 R-jqr
+R-jquerylib
 R-jsonlite
+R-kableExtra
 R-keras
 R-kernlab
 R-kimisc
@@ -533,6 +549,7 @@ R-listviewer
 R-lle
 R-lme4
 R-lmerTest
+R-lmom
 R-lmtest
 R-locfit
 R-logcondens
@@ -554,6 +571,7 @@ R-mapproj
 R-maps
 R-maptools
 R-markdown
+R-mathjaxr
 R-matrixStats
 R-matrixcalc
 R-maxLik
@@ -563,6 +581,7 @@ R-mda
 R-measures
 R-memisc
 R-memoise
+R-metafor
 R-mi
 R-mice
 R-microbenchmark
@@ -620,6 +639,7 @@ R-ordinal
 R-pROC
 R-packrat
 R-pamr
+R-pander
 R-parallelly
 R-parsedate
 R-partitions
@@ -651,6 +671,7 @@ R-pkgload
 R-pkgmaker
 R-plm
 R-plogr
+R-plot3D
 R-plotly
 R-plotmo
 R-plotrix
@@ -671,6 +692,7 @@ R-prefmod
 R-prettyunits
 R-princurve
 R-processx
+R-procmaps
 R-prodlim
 R-profdpm
 R-profileModel
@@ -701,6 +723,8 @@ R-quantmod
 R-quantreg
 R-questionr
 R-qvcalc
+R-ragg
+R-rainbow
 R-randomForest
 R-randomNames
 R-randtests
@@ -713,6 +737,7 @@ R-rbenchmark
 R-rbibutils
 R-rcmdcheck
 R-reactR
+R-reactable
 R-reactlog
 R-readODS
 R-readr
@@ -769,6 +794,7 @@ R-rsdmx
 R-rstan
 R-rstanarm
 R-rstantools
+R-rstpm2
 R-rstudio
 R-rstudio-server
 R-rstudioapi
@@ -779,6 +805,7 @@ R-rvest
 R-sROC
 R-sampling
 R-sandwich
+R-sass
 R-scales
 R-scatterplot3d
 R-sde
@@ -818,8 +845,11 @@ R-sourcetools
 R-sp
 R-spData
 R-spam
+R-sparkline
 R-spatstat
 R-spatstat.data
+R-spatstat.geom
+R-spatstat.sparse
 R-spatstat.utils
 R-spc
 R-spdep
@@ -842,9 +872,11 @@ R-subselect
 R-superpc
 R-survey
 R-svUnit
+R-svglite
 R-sys
 R-systemfit
 R-systemfonts
+R-tables
 R-tau
 R-taxize
 R-tclust
@@ -892,10 +924,12 @@ R-vcdExtra
 R-vcr
 R-vctrs
 R-vegan
+R-vembedr
 R-vioplot
 R-viridis
 R-viridisLite
 R-visNetwork
+R-waldo
 R-warp
 R-webmockr
 R-webshot
@@ -903,6 +937,7 @@ R-webutils
 R-whisker
 R-whoami
 R-wikitaxa
+R-winch
 R-withr
 R-worrms
 R-xfun
@@ -968,6 +1003,7 @@ XStatic-term.js
 Z3
 abireport
 absl-py
+abydos
 accountsservice
 acl
 acme
@@ -1000,6 +1036,7 @@ amtk
 analitza
 ansible
 antlr4-python3-runtime
+anyio
 apache-ant
 apipkg
 appdirs
@@ -1037,6 +1074,7 @@ astunparse
 asunder
 asv
 async-timeout
+async_generator
 at
 at-spi2-atk
 at-spi2-core
@@ -1062,96 +1100,11 @@ automake
 autossh
 avahi
 awesome-wm
+awesomeversion
 awscli
 axel
-azure-batch
-azure-cli
-azure-cli-command-modules-nspkg
-azure-cli-core
-azure-cli-nspkg
-azure-cli-telemetry
-azure-common
 azure-configs
-azure-core
-azure-cosmos
-azure-datalake-store
-azure-functions-devops-build
-azure-graphrbac
 azure-iot-sdk
-azure-keyvault
-azure-keyvault-certificates
-azure-keyvault-keys
-azure-keyvault-secrets
-azure-loganalytics
-azure-mgmt-advisor
-azure-mgmt-apimanagement
-azure-mgmt-appconfiguration
-azure-mgmt-applicationinsights
-azure-mgmt-authorization
-azure-mgmt-batch
-azure-mgmt-batchai
-azure-mgmt-billing
-azure-mgmt-botservice
-azure-mgmt-cdn
-azure-mgmt-cognitiveservices
-azure-mgmt-compute
-azure-mgmt-consumption
-azure-mgmt-containerinstance
-azure-mgmt-containerregistry
-azure-mgmt-containerservice
-azure-mgmt-core
-azure-mgmt-cosmosdb
-azure-mgmt-datalake-analytics
-azure-mgmt-datalake-nspkg
-azure-mgmt-datalake-store
-azure-mgmt-datamigration
-azure-mgmt-deploymentmanager
-azure-mgmt-devtestlabs
-azure-mgmt-dns
-azure-mgmt-eventgrid
-azure-mgmt-eventhub
-azure-mgmt-hdinsight
-azure-mgmt-imagebuilder
-azure-mgmt-iotcentral
-azure-mgmt-iothub
-azure-mgmt-iothubprovisioningservices
-azure-mgmt-keyvault
-azure-mgmt-kusto
-azure-mgmt-loganalytics
-azure-mgmt-managedservices
-azure-mgmt-managementgroups
-azure-mgmt-maps
-azure-mgmt-marketplaceordering
-azure-mgmt-media
-azure-mgmt-monitor
-azure-mgmt-msi
-azure-mgmt-netapp
-azure-mgmt-network
-azure-mgmt-nspkg
-azure-mgmt-policyinsights
-azure-mgmt-privatedns
-azure-mgmt-rdbms
-azure-mgmt-recoveryservices
-azure-mgmt-recoveryservicesbackup
-azure-mgmt-redhatopenshift
-azure-mgmt-redis
-azure-mgmt-relay
-azure-mgmt-reservations
-azure-mgmt-resource
-azure-mgmt-search
-azure-mgmt-security
-azure-mgmt-servicebus
-azure-mgmt-servicefabric
-azure-mgmt-signalr
-azure-mgmt-sql
-azure-mgmt-sqlvirtualmachine
-azure-mgmt-storage
-azure-mgmt-trafficmanager
-azure-mgmt-web
-azure-multiapi-storage
-azure-nspkg
-azure-storage-blob
-azure-storage-common
 babeltrace
 babl
 backcall
@@ -1183,6 +1136,8 @@ bleach
 blender
 blinken
 blinker
+blivet
+blivet-gui
 blktrace
 blockdiag
 bluedevil
@@ -1201,6 +1156,7 @@ boto
 boto3
 botocore
 bovo
+box2d
 bpftrace
 breeze
 breeze-gtk
@@ -1231,6 +1187,7 @@ byobu
 bz2file
 bzip2
 c-ares
+cJSON
 c_rehash
 ca-certs
 ca-certs-static
@@ -1335,22 +1292,20 @@ colord-gtk
 colordiff
 columbiad
 commonmark
-compat-boost-soname1.72.0
+compat-atkmm-soname16
 compat-boost-soname1.73.0
+compat-cairomm-soname10
 compat-curl-gnutls-soname4
 compat-enchant-soname1
 compat-fuse-soname2
+compat-glibmm-soname24
 compat-gtksourceview-soname3
-compat-hunspell-soname1.6
-compat-icu4c-soname64
 compat-libhandy-0.0
 compat-libpng-soname12
-compat-libraw-soname19
+compat-libsigc++-soname20
 compat-libva-soname1
-compat-nettle-soname6
 compat-nettle-soname7
-compat-opencv-soname42
-compat-protobuf-soname22
+compat-pangomm-soname14
 compat-re2-soname7
 compat-readline-soname5
 compat-tracker-soname2.0
@@ -1393,6 +1348,7 @@ cups
 cups-bjnp
 cups-filters
 cups-pk-helper
+curio
 curl
 custom_inherit
 cve-bin-tool
@@ -1420,6 +1376,7 @@ decorator
 defusedxml
 dejagnu
 dejavu-fonts
+deprecation
 desktop-file-utils
 devhelp
 dfc
@@ -1431,6 +1388,7 @@ diffoscope
 diffstat
 diffutils
 digikam
+dill
 ding-libs
 dino
 direwolf
@@ -1626,6 +1584,7 @@ geany
 geany-plugins
 geary
 gedit
+gedit-plugins-gnome
 geeqie
 gegl
 gensim
@@ -1866,6 +1825,7 @@ importlib_metadata
 indent
 influxdb
 iniconfig
+inih
 iniparse
 init-rdahead
 inkscape
@@ -1922,6 +1882,7 @@ iwd
 ixion
 jack2
 jansson
+janus
 jaraco.classes
 jaraco.collections
 jaraco.functools
@@ -1931,6 +1892,7 @@ javaproperties
 jdcal
 jedi
 jeepney
+jellyfish
 jemalloc
 jmespath
 joblib
@@ -1953,13 +1915,16 @@ juk
 jupyter
 jupyter-nbgallery
 jupyter-notebook-gist
+jupyter-packaging
 jupyter_client
 jupyter_console
 jupyter_core
+jupyter_server
 jupyterlab
 jupyterlab_launcher
 jupyterlab_pygments
 jupyterlab_server
+jupyterlab_widgets
 kactivities
 kactivities-stats
 kactivitymanagerd
@@ -2164,6 +2129,7 @@ ktp-desktop-applets
 ktuberling
 kturtle
 kubernetes
+kubernetes-migration-1.18
 kunitconversion
 kwallet
 kwallet-pam
@@ -2214,7 +2180,6 @@ libXtst
 libXv
 libXvMC
 libXxf86dga
-libXxf86misc
 libabigail
 libabw
 libaio
@@ -2258,6 +2223,7 @@ libdmx
 libdnf
 libdrm
 libe-book
+libebur128
 libeconf
 libedit
 libepoxy
@@ -2593,6 +2559,7 @@ mkl-dnn
 mkosi
 mlocate
 mlt
+mm-common
 mmc-utils
 mobile-broadband-provider-info
 mock
@@ -2619,14 +2586,11 @@ mpg123
 mpi4py
 mpmath
 mpv
-msal
-msal-extensions
 msgpack
 msgpack-c
 msmtp
 msr-tools
 msrest
-msrestazure
 mstflint
 mtd-utils
 mtdev
@@ -2652,6 +2616,8 @@ nagios-plugins
 nano
 nasm
 nautilus
+nbclassic
+nbclient
 nbconvert
 nbformat
 nbval
@@ -2664,6 +2630,7 @@ ndpi
 neofetch
 neomutt
 neovim
+nest_asyncio
 net-snmp
 net-tools
 netaddr
@@ -2793,6 +2760,7 @@ p11-kit
 p7zip
 packaging
 pacrunner
+paho-mqtt
 paho.mqtt.c
 paho.mqtt.cpp
 palapeli
@@ -2830,6 +2798,7 @@ pdns
 pdns-recursor
 pdsh
 pecan
+ped
 pep517
 pep8
 perftest
@@ -3416,6 +3385,7 @@ perl-SGMLS
 perl-SMTP-Server
 perl-SQL-Abstract
 perl-SQL-Abstract-Classic
+perl-SQL-Abstract-Pg
 perl-SQL-SplitStatement
 perl-SQL-Tokenizer
 perl-SQL-Translator
@@ -3652,6 +3622,7 @@ perl-prefork
 perl-strictures
 persistent
 pesign
+petastorm
 pexpect
 phonon
 phonon-vlc
@@ -3724,6 +3695,7 @@ php-zmq
 pickleshare
 picmi
 picocom
+pid
 pidgin
 pidgin-sipe
 pigeonhole
@@ -3840,6 +3812,7 @@ pynvim
 pyotherside
 pyotp
 pyparsing
+pyparted
 pyperclip
 pyperf
 pyquery
@@ -3904,6 +3877,7 @@ pyu2f
 pyudev
 pyusb
 pywbem
+pyxDamerauLevenshtein
 pyxattr
 pyxdg
 pyzmq
@@ -3994,6 +3968,7 @@ requests-mock
 requests-ntlm
 requests-oauthlib
 requests-toolbelt
+requests-unixsocket
 responses
 rest
 restic
@@ -4009,6 +3984,7 @@ rinutils
 rjsmin
 rlwrap
 rng-tools
+robin-map
 roboto
 rocs
 rofi
@@ -4223,6 +4199,7 @@ texinfo
 texlive
 texmaker
 text-unidecode
+textdistance
 texttable
 tflearn
 tgt
@@ -4273,6 +4250,7 @@ typing_extensions
 tzdata
 tzlocal
 ua-parser
+uamqp
 ucpp
 udisks2
 udunits
Author	SHA1	Message	Date
clrbuilder	b443e169d5	Update packages file for version 34360 Signed-off-by: clrbuilder <clrbuilder@intel.com>	2021-03-09 00:06:34 -08:00
Patrick McCarty	cd55363a3c	Improve detection of the debuginfo rpm It's not likely for a package name to have the substring "-debuginfo", but just in case, implement more robust detection of the actual debuginfo rpm for a package by constructing the name more carefully. Signed-off-by: Patrick McCarty <patrick.mccarty@intel.com>	2021-03-09 06:19:40 +00:00
Patrick McCarty	e0054520f8	Filter out debuginfo rpms when scanning for banned files The debuginfo subpackages are automatically generated, with content installed according to a predefined directory layout, so there is little value in checking for banned files they may ship. Signed-off-by: Patrick McCarty <patrick.mccarty@intel.com>	2021-03-09 06:02:10 +00:00
Patrick McCarty	ecb84bfabf	Add two new CRAN packages Needed to satisfy new updates for `R-kableExtra` and `R-ks`. Signed-off-by: Patrick McCarty <patrick.mccarty@intel.com>	2021-03-08 22:43:34 +00:00
clrbuilder	6b3a74eea5	Update packages file for version 34350 Signed-off-by: clrbuilder <clrbuilder@intel.com>	2021-03-04 00:08:35 -08:00
Patrick McCarty	9b81676c6f	The `make diff` command should ignore untracked content If a package repo contains only untracked content, `make diff` prints output for it in this form: Uncommitted changes in: packages/FOO 0 files changed Avoid this type of output by more carefully detecting local package repo changes that will actually produce a diffstat. Signed-off-by: Patrick McCarty <patrick.mccarty@intel.com>	2021-03-04 02:17:03 +00:00
clrbuilder	e0844510f6	Update packages file for version 34340 Signed-off-by: clrbuilder <clrbuilder@intel.com>	2021-03-02 12:35:14 -08:00
clrbuilder	536b562a5b	Update packages file for version 34330 Signed-off-by: clrbuilder <clrbuilder@intel.com>	2021-03-02 08:12:17 -08:00
clrbuilder	c4cb75a89f	Update packages file for version 34310 Signed-off-by: clrbuilder <clrbuilder@intel.com>	2021-02-25 00:07:59 -08:00
clrbuilder	244e21ef2d	Update packages file for version 34300 Signed-off-by: clrbuilder <clrbuilder@intel.com>	2021-02-23 00:09:02 -08:00
clrbuilder	8defd1c276	Update packages file for version 34290 Signed-off-by: clrbuilder <clrbuilder@intel.com>	2021-02-18 00:08:17 -08:00
clrbuilder	3bd55aea4f	Update packages file for version 34280 Signed-off-by: clrbuilder <clrbuilder@intel.com>	2021-02-16 00:08:08 -08:00
clrbuilder	e76c4bd179	Update packages file for version 34270 Signed-off-by: clrbuilder <clrbuilder@intel.com>	2021-02-11 00:07:31 -08:00
clrbuilder	2383eca632	Update packages file for version 34260 Signed-off-by: clrbuilder <clrbuilder@intel.com>	2021-02-09 00:08:27 -08:00
clrbuilder	89f861fda6	Update packages file for version 34250 Signed-off-by: clrbuilder <clrbuilder@intel.com>	2021-02-04 00:07:32 -08:00
clrbuilder	447126c594	Update packages file for version 34230 Signed-off-by: clrbuilder <clrbuilder@intel.com>	2021-02-02 00:09:39 -08:00
Patrick McCarty	a3ad322a0a	Add a few new R packages Signed-off-by: Patrick McCarty <patrick.mccarty@intel.com>	2021-01-27 23:17:04 +00:00
clrbuilder	c357625466	Update packages file for version 34200 Signed-off-by: clrbuilder <clrbuilder@intel.com>	2021-01-26 00:09:59 -08:00
clrbuilder	ee3938da6c	Update packages file for version 34190 Signed-off-by: clrbuilder <clrbuilder@intel.com>	2021-01-21 00:07:46 -08:00
clrbuilder	d86d9e564d	Update packages file for version 34170 Signed-off-by: clrbuilder <clrbuilder@intel.com>	2021-01-14 00:07:31 -08:00
clrbuilder	df467c348a	Update packages file for version 34160 Signed-off-by: clrbuilder <clrbuilder@intel.com>	2021-01-12 00:08:32 -08:00
clrbuilder	581aa3f813	Update packages file for version 34150 Signed-off-by: clrbuilder <clrbuilder@intel.com>	2021-01-07 00:08:07 -08:00
Patrick McCarty	5946c4dfa9	koji: support local branch names of 'main' as well Signed-off-by: Patrick McCarty <patrick.mccarty@intel.com>	2021-01-06 18:42:00 +00:00
clrbuilder	f3e7eec6dc	Update packages file for version 34140 Signed-off-by: clrbuilder <clrbuilder@intel.com>	2021-01-05 00:08:24 -08:00
Patrick McCarty	fca54d3027	Add jupyter-packaging and jupyterlab_widgets Needed for the latest ipywidgets update. Signed-off-by: Patrick McCarty <patrick.mccarty@intel.com>	2020-12-29 20:45:59 +00:00
clrbuilder	6550c61092	Update packages file for version 34100 Signed-off-by: clrbuilder <clrbuilder@intel.com>	2020-12-17 00:07:32 -08:00