Place koji user configuration in user folder

Avoid placing koji.conf in a system-level directory

Signed-off-by: George T Kramer <george.t.kramer@intel.com>

Makefile.common

@@ -187,6 +187,7 @@ autospec: preautospec-checks pullrebase localreponotice clean-old-content
 		git commit --amend --no-edit Change* ; \
 	fi
 	@$(MAKE) -s for-review.txt
+	diffstat for-review.txt
 	@printf "\n**\n"
 	@printf "** NOTICE: A patch with changes is available in the file for-review.txt\n"
 	@printf "** To recreate (e.g., after git commit --amend), run make for-review.txt\n"

packages

@@ -8,6 +8,7 @@ Cheetah
 CherryPy
 Coin
 ConfigArgParse
+CopyQ
 Counter
 Cura
 CuraEngine
@@ -22,6 +23,7 @@ FreeCAD
 FreeRDP
 GConf
 GitPython
+Gradio
 GtkD
 HeapDict
 ImageMagick
@@ -152,6 +154,8 @@ R-R.oo
 R-R.utils
 R-R2Cuba
 R-R2HTML
+R-R2WinBUGS
+R-R2jags
 R-R6
 R-RANN
 R-RColorBrewer
@@ -544,6 +548,7 @@ R-minpack.lm
 R-minqa
 R-mirt
 R-misc3d
+R-miscF
 R-miscTools
 R-mitools
 R-mixtools
@@ -889,6 +894,7 @@ SPIRV-Headers
 SPIRV-Tools
 SQLAlchemy
 SQLAlchemy-Utils
+Sane
 Send2Trash
 Shapely
 SmartXbar
@@ -1001,6 +1007,7 @@ appstream
 appstream-glib
 apr
 apr-util
+arandr
 arc-theme
 argcomplete
 argon2
@@ -1315,6 +1322,7 @@ compat-llvm-soname6
 compat-llvm-soname7
 compat-mariadb-soname18
 compat-mpfr-soname4
+compat-nettle-soname6
 compat-opencv-soname32
 compat-opencv-soname33
 compat-opencv-soname34
@@ -1515,6 +1523,7 @@ dmidecode
 dmlc-core
 dnf
 dnf-plugins-core
+dns-lexicon
 dnsmasq
 dnspython
 doc8
@@ -1646,6 +1655,7 @@ flatpak-builder
 fldigi
 flex
 flink-dep
+fllog
 flmsg
 flnet
 flrig
@@ -1695,6 +1705,7 @@ gdl
 gdm
 geany
 geany-plugins
+geary
 gedit
 gegl
 gensim
@@ -1921,6 +1932,7 @@ igt-gpu-tools
 ilmbase
 image
 imageio
+imagescan
 imagesize
 imapfilter
 imlib2
@@ -1950,6 +1962,7 @@ ipaddress
 ipcalc
 ipdb
 ipdbplugin
+ipe
 iperf
 ipmctl
 ipmitool
@@ -2094,6 +2107,7 @@ keditbookmarks
 keepalived
 keepassxc
 kemoticons
+kerberos
 kernel-config
 kernel-config-checker
 kernel-install
@@ -2352,6 +2366,7 @@ libgcrypt
 libgd
 libgdata
 libgee
+libgeotiff
 libgepub
 libgfortran-avx
 libgfortran-compat-soname3
@@ -2442,6 +2457,7 @@ libpeas
 libpfm
 libpinyin
 libpipeline
+libplacebo
 libpng
 libpsl
 libpthread-stubs
@@ -2606,6 +2622,8 @@ lz4
 lzlib
 lzo
 lzop
+m17n-db
+m17n-lib
 m4
 mailcommon
 mailimporter
@@ -2631,6 +2649,7 @@ meld
 memcached
 memkind
 memshrinker
+memtier_benchmark
 menu-cache
 mercurial
 mesa
@@ -2707,6 +2726,8 @@ musl
 mutagen
 mutt
 mutter
+mvn-RoaringBitmap
+mvn-activation
 mvn-aether-core
 mvn-animal-sniffer
 mvn-antlr
@@ -2715,19 +2736,25 @@ mvn-aopalliance
 mvn-apache
 mvn-apache-jar-resource-bundle
 mvn-apache-rat
+mvn-arpack_combined_all
 mvn-asm
 mvn-autolink
 mvn-avalon-framework
+mvn-avro
 mvn-backport-util-concurrent
 mvn-beanshell
 mvn-biz.aQute.bndlib
 mvn-bndlib
+mvn-breeze-macros_2.11
+mvn-breeze_2.11
 mvn-build-helper-maven-plugin
 mvn-buildnumber-maven-plugin
 mvn-byte-buddy
 mvn-cdi-api
 mvn-checker-compat-qual
 mvn-checkstyle
+mvn-chill-java
+mvn-chill_2.11
 mvn-classworlds
 mvn-codehaus-jackson
 mvn-commons-beanutils
@@ -2736,6 +2763,8 @@ mvn-commons-cli
 mvn-commons-codec
 mvn-commons-collections
 mvn-commons-compress
+mvn-commons-configuration
+mvn-commons-crypto
 mvn-commons-digester
 mvn-commons-httpclient
 mvn-commons-io
@@ -2743,8 +2772,11 @@ mvn-commons-jxpath
 mvn-commons-lang
 mvn-commons-lang3
 mvn-commons-logging
+mvn-commons-math3
 mvn-commons-parent
 mvn-commons-validator
+mvn-compress-lzf
+mvn-curator
 mvn-decentxml
 mvn-dom4j
 mvn-doxia
@@ -2758,9 +2790,11 @@ mvn-flexmark-java
 mvn-genesis
 mvn-google
 mvn-google-collections
+mvn-gson
 mvn-guava
 mvn-guice
 mvn-hamcrest
+mvn-htrace
 mvn-httpcomponents-client
 mvn-httpcomponents-core
 mvn-icu4j
@@ -2769,12 +2803,19 @@ mvn-jackrabbit
 mvn-jackson-annotations
 mvn-jackson-core
 mvn-jackson-databind
+mvn-jackson-module-paranamer
+mvn-jackson-module-scala_2.11
 mvn-jansi
 mvn-java-boot-classpath-detector
 mvn-javax-servlet
+mvn-javax.annotation-api
 mvn-javax.inject
+mvn-javax.servlet-api
+mvn-javax.ws.rs-api
+mvn-jaxb-api
 mvn-jaxb-impl
 mvn-jdom
+mvn-jersey
 mvn-jersey-apache-client4
 mvn-jersey-core
 mvn-jersey-json
@@ -2790,16 +2831,23 @@ mvn-jsch.agentproxy.sshagent
 mvn-jsch.agentproxy.svnkit-trilead-ssh2
 mvn-jsch.agentproxy.usocket-jna
 mvn-jsch.agentproxy.usocket-nc
+mvn-json4s_2.11
 mvn-jsoup
 mvn-jsr250-api
 mvn-jsr305
 mvn-jsr311-api
+mvn-jtransforms
 mvn-junit
+mvn-kryo
 mvn-kxml2
+mvn-leveldbjni
 mvn-log4j
 mvn-logback-classic
 mvn-logback-core
 mvn-logkit
+mvn-lz4-java
+mvn-machinist_2.11
+mvn-macro-compat_2.11
 mvn-maven
 mvn-maven-aether-provider
 mvn-maven-archiver
@@ -2836,15 +2884,18 @@ mvn-maven-shared
 mvn-maven-slf4j-provider
 mvn-maven-surefire
 mvn-maven-toolchain
+mvn-minlog
 mvn-mockito-core
 mvn-modello
 mvn-mojo-parent
 mvn-mojo-signature
 mvn-mvnplugins
 mvn-nekohtml
+mvn-netlib-java
 mvn-nexus-maven-plugins
 mvn-nexus-public
 mvn-objenesis
+mvn-opencsv
 mvn-openhtmltopdf-parent
 mvn-org.apache.felix.bundlerepository
 mvn-org.eclipse.sisu.inject
@@ -2852,8 +2903,11 @@ mvn-org.eclipse.sisu.plexus
 mvn-org.osgi.compendium
 mvn-org.osgi.core
 mvn-oro
+mvn-osgi-resource-locator
 mvn-oss-parents
 mvn-ow2
+mvn-paranamer
+mvn-parquet-mr
 mvn-pdfbox
 mvn-plexus
 mvn-plexus-archiver
@@ -2872,20 +2926,26 @@ mvn-plexus-resources
 mvn-plexus-utils
 mvn-plexus-velocity
 mvn-protobuf-java
+mvn-py4j
+mvn-pyrolite
 mvn-qdox
 mvn-sequence-library
 mvn-servlet-api
+mvn-shapeless_2.11
 mvn-siesta
 mvn-sisu
 mvn-sisu-maven-plugin
 mvn-slf4j
 mvn-snakeyaml
 mvn-snappy
+mvn-snappy-java
 mvn-sonatype-aether
 mvn-sonatype-plexus-sec-dispatcher
 mvn-spice-zapper
+mvn-spire_2.11
 mvn-sqljet
 mvn-sslext
+mvn-stream-lib
 mvn-struts
 mvn-svnkit
 mvn-trilead-ssh2
@@ -2900,6 +2960,7 @@ mvn-xbean
 mvn-xercesImpl
 mvn-xercesMinimal
 mvn-xml-apis
+mvn-xmlenc
 mvn-xmlunit
 mvn-xmlunit-core
 mvn-xz
@@ -3147,6 +3208,7 @@ perl-AnyEvent-CacheDNS
 perl-Apache-Htpasswd
 perl-Apache-Session
 perl-App-cpanminus
+perl-AppConfig
 perl-Archive-Cpio
 perl-Archive-Extract
 perl-Archive-Tar-Wrapper
@@ -3158,6 +3220,7 @@ perl-Audio-FLAC-Header
 perl-Audio-Musepack
 perl-Audio-Scan
 perl-Audio-Wav
+perl-Authen-NTLM
 perl-Authen-SASL
 perl-B-Hooks-EndOfScope
 perl-B-Hooks-OP-Check
@@ -3213,6 +3276,7 @@ perl-Class-Singleton
 perl-Class-Std
 perl-Class-Std-Fast
 perl-Class-Tiny
+perl-Class-Trigger
 perl-Class-Unload
 perl-Class-XSAccessor
 perl-Clipboard
@@ -3229,8 +3293,10 @@ perl-Config-Std
 perl-Config-Tiny
 perl-Context-Preserve
 perl-Convert-ASN1
+perl-Convert-Bencode
 perl-Convert-Binary-C
 perl-Cookie-Baker
+perl-Coro
 perl-Cpanel-JSON-XS
 perl-Crypt-DH-GMP
 perl-Crypt-Eksblowfish
@@ -3306,6 +3372,7 @@ perl-Digest-CRC
 perl-Digest-HMAC
 perl-Digest-JHash
 perl-Digest-MD5
+perl-Digest-SHA1
 perl-Digest-SHA3
 perl-Dist-CheckConflicts
 perl-Domain-PublicSuffix
@@ -3381,6 +3448,7 @@ perl-Geo-Distance
 perl-Geo-IP
 perl-Geo-IPfree
 perl-Getopt-Euclid
+perl-Getopt-Long-Descriptive
 perl-Getopt-Tabular
 perl-Git-Version-Compare
 perl-Glib
@@ -3448,6 +3516,7 @@ perl-Importer
 perl-Inline
 perl-Inline-C
 perl-JSON
+perl-JSON-Any
 perl-JSON-MaybeXS
 perl-JSON-RPC
 perl-JSON-XS
@@ -3534,12 +3603,17 @@ perl-MooX-Role-Parameterized
 perl-Moose
 perl-MooseX-Role-Parameterized
 perl-MooseX-Role-WithOverloading
+perl-MooseX-Types
+perl-MooseX-Types-JSON
+perl-MooseX-Types-LoadableClass
+perl-MooseX-Types-Path-Class
 perl-Mozilla-CA
 perl-Net-Bluetooth
 perl-Net-CIDR-Lite
 perl-Net-DBus
 perl-Net-DNS
 perl-Net-DNS-Resolver-Programmable
+perl-Net-Daemon
 perl-Net-HTTP
 perl-Net-IDN-Encode
 perl-Net-INET6Glue
@@ -3552,6 +3626,7 @@ perl-Net-OpenID-Consumer
 perl-Net-OpenSSH
 perl-Net-SFTP-Foreign
 perl-Net-SMTP-SSL
+perl-Net-SSH2
 perl-Net-SSLeay
 perl-Net-Server
 perl-Net-UPnP
@@ -3561,7 +3636,9 @@ perl-Number-Bytes-Human
 perl-Number-Compare
 perl-Number-Format
 perl-Number-WithError
+perl-Object-Accessor
 perl-Object-Signature
+perl-PDF-API2
 perl-PDF-Table
 perl-PDF-Writer
 perl-POD2-Base
@@ -3595,6 +3672,7 @@ perl-PerlIO-eol
 perl-PerlIO-gzip
 perl-PerlIO-utf8_strict
 perl-PerlIO-via-Timeout
+perl-PlRPC
 perl-Pod-Constants
 perl-Pod-Coverage
 perl-Pod-LaTeX
@@ -3636,6 +3714,7 @@ perl-Specio
 perl-Spiffy
 perl-Statistics-Basic
 perl-Statistics-CaseResampling
+perl-Stream-Buffered
 perl-String-Approx
 perl-String-CamelCase
 perl-String-Escape
@@ -3645,6 +3724,7 @@ perl-String-Random
 perl-String-Similarity
 perl-Struct-Dumb
 perl-Sub-Exporter
+perl-Sub-Exporter-ForMethods
 perl-Sub-Exporter-Progressive
 perl-Sub-Identify
 perl-Sub-Info
@@ -3660,8 +3740,10 @@ perl-Sys-Mmap
 perl-Sys-SigAction
 perl-Sys-Statistics-Linux
 perl-System-Command
+perl-TAP-Formatter-HTML
 perl-TAP-Harness-Archive
 perl-Taint-Util
+perl-Template-Toolkit
 perl-Term-ProgressBar
 perl-Term-ReadKey
 perl-Term-ReadLine-Gnu
@@ -3688,6 +3770,7 @@ perl-Test-LeakTrace
 perl-Test-LectroTest
 perl-Test-LongString
 perl-Test-Manifest
+perl-Test-Memory-Cycle
 perl-Test-MockModule
 perl-Test-MockTime
 perl-Test-More-UTF8
@@ -3732,6 +3815,7 @@ perl-Text-Levenshtein-Damerau
 perl-Text-Markdown
 perl-Text-PDF
 perl-Text-Quoted
+perl-Text-RecordParser
 perl-Text-Reform
 perl-Text-Roman
 perl-Text-TabularDisplay
@@ -3765,6 +3849,7 @@ perl-UUID-Tiny
 perl-Unicode-LineBreak
 perl-Unicode-Map
 perl-Variable-Magic
+perl-WWW-Form-UrlEncoded
 perl-WWW-Form-UrlEncoded-XS
 perl-WWW-RobotRules
 perl-X11-IdleTime
@@ -3795,6 +3880,7 @@ perl-YAML
 perl-YAML-LibYAML
 perl-YAML-Syck
 perl-YAML-Tiny
+perl-accessors
 perl-aliased
 perl-autobox
 perl-autovivification
@@ -3862,6 +3948,7 @@ ply
 plzip
 pm-graph
 pmdk
+po4a
 polkit
 polkit-kde-agent
 polkit-qt
@@ -3945,7 +4032,6 @@ pygtk
 pygtkglext
 pyhs100
 pyinotify
-pykerberos
 pykwalify
 pylama
 pyliblzma
@@ -4054,7 +4140,6 @@ qbittorrent
 qca-qt5
 qemu
 qemu-guest-additions
-qemu-lite
 qgit
 qhull
 qml-box2d
@@ -4135,6 +4220,7 @@ repoze.lru
 repoze.sphinx.autointerface
 repoze.who
 requests
+requests-file
 requests-kerberos
 requests-mock
 requests-ntlm
@@ -4402,6 +4488,7 @@ tinyrpc
 tinyxml2
 tiptop
 tk
+tldextract
 tmux
 todoist
 tokyocabinet
@@ -4622,6 +4709,7 @@ yasm
 yelp
 yelp-tools
 yelp-xsl
+ytnef
 yum
 yum-metadata-parser
 zVMCloudConnector

patchfilter.py

@@ -265,6 +265,7 @@ def main():
     zap_line_in_file_start(".spec", "%description dev")
     zap_line_in_file_start(".spec", "%description license")
     zap_line_in_file_start(".spec", "%package doc")
+    zap_line_in_file_start(".spec", "cp -a ")
  
     zap_line_in_file_start("b/Makefile", "URL =")
     zap_line_in_file_start("b/Makefile", "PKG_NAME :=")

user-setup.sh

@@ -145,9 +145,9 @@ if [ "$USE_KOJI" ]; then
   cp "$CLIENTCA" ~/.koji/clientca.crt
   cp "$SERVERCA" ~/.koji/serverca.crt
 
-  if [ ! -f /etc/koji.conf ]; then
+  if [ ! -f ~/.koji/config ]; then
     echo "Setting up koji config . . ."
-    sudo cp projects/common/conf/koji.conf /etc
+    cp -f projects/common/conf/koji.conf ~/.koji/config
   fi
 fi