Update packages file for version 30020

Signed-off-by: clrbuilder <clrbuilder@intel.com>

Makefile.common

@@ -186,8 +186,18 @@ autospec: preautospec-checks pullrebase localreponotice clean-old-content
 		bash update_changelog.sh ; \
 		git commit --amend --no-edit Change* ; \
 	fi
-	git diff | grep -q index || python3 $(TOPLVL)/projects/common/patchfilter.py > for-review.txt ;
+	@$(MAKE) -s for-review.txt
-	git diff | grep -q index || python3 $(TOPLVL)/projects/common/patchfilter.py ;
+	@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"
+	@printf "** To submit for review: git send-email --to <recipient> for-review.txt\n"
+	@printf "**\n\n"
+
+#help for-review.txt: Creates the for-review.txt file, which is
+#help a minimized version of the Git commit, suitable for code review.
+for-review.txt:
+	git diff | grep -q index || python3 $(TOPLVL)/projects/common/patchfilter.py > for-review.txt
+.PHONY: for-review.txt
 
 #help autospecnogit: Runs autospec, but does not create a commit
 autospecnogit:
@@ -269,6 +279,7 @@ sources:
 	@$(MAKE) generateupstream; \
 	[ $$? -eq 0 ] && exit 0; \
 	nvr="$$(rpmspec --srpm -q --qf '%{NAME}\t%{VERSION}\t%{RELEASE}\n' $(SPECFILE))"; \
+	git -C $(TOPLVL)/projects/common fetch --tags >/dev/null 2>&1; \
 	latest_builds=$$(git -C $(TOPLVL)/projects/common tag -l | sort -rn); \
 	for b in $$latest_builds; do \
 		url="$(DOWNLOAD_MIRROR)/releases/$$b/clear/source/package-sources"; \

Makefile.toplevel

@@ -11,6 +11,7 @@ SHELL   = /bin/bash
 
 PKGS    = $(shell cat $(PACKAGES_FILE))
 PKGS_LOCAL = $(sort $(filter ${PKGS},$(subst packages/,,$(wildcard packages/*))))
+PKGS_ORPHANED = $(sort $(filter-out common ${PKGS},$(subst packages/,,$(wildcard packages/*))))
 
 proj_PKGS = $(addprefix proj_,$(PROJ_PKGS))
 clone_PKGS = $(addprefix clone_,$(PKGS))
@@ -128,11 +129,9 @@ pull: ${PULL_PKGS}
 #help clean-pkgs-dir: For packages that are no longer present in the distro,
 #help removes the associated package repos from the ./packages tree
 clean-pkgs-dir: $(PACKAGES_FILE)
-	@for p in `ls packages`; do \
+	@for p in ${PKGS_ORPHANED}; do \
-		if ! grep -wq "^$$p$$" "$<" && [ "$$p" != common ]; then \
+		echo "Removing $$p from packages, it is no longer in common/packages."; \
-			echo "Removing $$p from packages, it is no longer in common/packages."; \
+		rm -rf packages/$$p; \
-			rm -rf packages/$$p; \
-		fi \
 	done
 	@echo "packages directory cleaned";
 
@@ -229,8 +228,11 @@ autospecnew: preautospecnew-checks localreponotice
 		if [ $$? -eq 0 ]; then \
 			$(MAKE) link-new-rpms PKG_REPO_DIR="${TOPLVL}/packages/${NAME}"; \
 			$(TOPLVL)/projects/common/checkblacklist.sh $(TOPLVL)/projects/common/blacklist $(TOPLVL)/packages/${NAME}/results/*.rpm; \
-			python3 $(TOPLVL)/projects/common/patchfilter.py <(git -C $(TOPLVL)/packages/$(NAME) show) > $(TOPLVL)/packages/$(NAME)/for-review.txt; \
+			python3 $(TOPLVL)/projects/common/patchfilter.py <(git -C $(TOPLVL)/packages/$(NAME) format-patch -1 --stdout) > $(TOPLVL)/packages/$(NAME)/for-review.txt; \
-			python3 $(TOPLVL)/projects/common/patchfilter.py <(git -C $(TOPLVL)/packages/$(NAME) show); \
+			printf "\n**\n"; \
+			printf "** NOTICE: A patch with changes is available in the file $(TOPLVL)/packages/$(NAME)/for-review.txt\n"; \
+			printf "** Please look through this file and if you are unsure, please submit for code review with git send-email\n"; \
+			printf "**\n\n"; \
 		fi; \
 	else \
 		echo "$(NAME) already exists at $(TOPLVL)/packages/$(NAME)"; \

packages

@@ -308,6 +308,7 @@ R-desc
 R-devtools
 R-dfoptim
 R-dichromat
+R-diffobj
 R-diffusionMap
 R-digest
 R-dimRed
@@ -387,6 +388,9 @@ R-fitdistrplus
 R-flashClust
 R-flexmix
 R-flexsurv
+R-fontBitstreamVera
+R-fontLiberation
+R-fontquiver
 R-forcats
 R-foreach
 R-forecast
@@ -407,6 +411,7 @@ R-gbm
 R-gbutils
 R-gclus
 R-gdata
+R-gdtools
 R-geepack
 R-geiger
 R-generics
@@ -503,6 +508,7 @@ R-lme4
 R-lmerTest
 R-lmtest
 R-locfit
+R-logcondens
 R-logspline
 R-loo
 R-lpSolve
@@ -723,6 +729,7 @@ R-rstan
 R-rstanarm
 R-rstantools
 R-rstudio
+R-rstudio-server
 R-rstudioapi
 R-rsvg
 R-runjags
@@ -890,6 +897,7 @@ SuiteSparse
 Tempita
 Theano
 Thunar
+UCD
 UkPostcodeParser
 Unidecode
 Uranium
@@ -977,6 +985,7 @@ aniso8601
 ansible
 anyjson
 apache-ant
+apache-flink
 apache-hadoop
 apache-kafka
 apache-libcloud
@@ -997,6 +1006,8 @@ argparse
 aria2
 ark
 armadillo
+arp-scan
+arpack-ng
 artikulate
 asciidoc
 asciinema
@@ -1153,6 +1164,8 @@ cantor
 capnproto
 caribou
 case
+cassandra
+cassandra-dep
 castellan
 casync
 catch2
@@ -1269,6 +1282,7 @@ compat-efivar-soname0
 compat-enchant-soname1
 compat-exiv2-soname26
 compat-fuse-soname2
+compat-gdal-soname20
 compat-gegl
 compat-gegl-0.3
 compat-glew-soname1
@@ -1280,6 +1294,7 @@ compat-hdf5-soname10
 compat-hwloc-soname5
 compat-hyperscan-soname4
 compat-icu4c-soname61
+compat-icu4c-soname63
 compat-ilmbase-soname23
 compat-intel-gmmlib-soname1
 compat-ipset-soname10
@@ -1306,6 +1321,7 @@ compat-poppler-soname78
 compat-poppler-soname82
 compat-poppler-soname83
 compat-poppler-soname86
+compat-proj-soname13
 compat-protobuf-soname14
 compat-protobuf-soname15
 compat-python36
@@ -1524,6 +1540,7 @@ dpdk
 dracut
 dragon
 drkonqi
+dssi
 dstat
 dtc
 dtopt
@@ -1625,6 +1642,7 @@ flatpak
 flatpak-builder
 fldigi
 flex
+flink-dep
 flmsg
 flnet
 fltk
@@ -1635,6 +1653,7 @@ fontconfig
 fontforge
 fonttools
 fossil
+fox
 frameworkintegration
 freedv
 freeglut
@@ -1648,7 +1667,6 @@ funcparserlib
 funcsigs
 functools32
 fuse
-futures
 futurist
 fwupd
 fwupdate
@@ -1688,6 +1706,7 @@ gftp
 ghc
 ghostscript
 gimp
+girara
 git
 git-gui
 gitdb2
@@ -1742,6 +1761,7 @@ gnome-music
 gnome-online-accounts
 gnome-panel
 gnome-photos
+gnome-screensaver
 gnome-screenshot
 gnome-session
 gnome-settings-daemon
@@ -1798,6 +1818,7 @@ grilo-plugins
 groff
 grpcio
 grub
+gsequencer
 gsettings-desktop-schemas
 gsl
 gsm
@@ -1845,6 +1866,7 @@ helloworld
 helm
 help2man
 hexchat
+hexedit
 hgtools
 hicolor-icon-theme
 hiredis
@@ -1877,6 +1899,8 @@ iasimage
 ibus
 ibus-libpinyin
 ibus-table
+ibus-typing-booster
+ibus-unikey
 icalendar
 icdiff
 iceauth
@@ -1894,6 +1918,7 @@ imageio
 imagesize
 imapfilter
 imlib2
+importlib_metadata
 indent
 infiniband-diags
 inflection
@@ -1901,6 +1926,7 @@ influxdb
 iniparse
 init-rdahead
 inkscape
+innoextract
 inotify-tools
 intel-cmt-cat
 intel-compute-runtime
@@ -1972,6 +1998,7 @@ jsonpath-rw-ext
 jsonpointer
 jsonrpc-glib
 jsonschema
+junit-xml
 jupyter
 jupyter-nbgallery
 jupyter-notebook-gist
@@ -2213,6 +2240,7 @@ kwrited
 kxmlgui
 kxmlrpcclient
 kyotocabinet
+ladspa_sdk
 lark-parser
 latencytop
 latexcodec
@@ -2257,6 +2285,7 @@ libaio
 libappindicator
 libarchive
 libarchive-c
+libass
 libassuan
 libasyncns
 libatasmart
@@ -2273,6 +2302,7 @@ libcdio
 libcdr
 libcgroup
 libchamplain
+libclc
 libcmis
 libcomps
 libconfig
@@ -2338,6 +2368,7 @@ libidn
 libidn2
 libindicator
 libinput
+libinstpatch
 libiscsi
 libisofs
 libite
@@ -2423,6 +2454,7 @@ libsamplerate
 libsass
 libseccomp
 libsecret
+libshout
 libsigc++
 libsigsegv
 libsmbios
@@ -2515,7 +2547,6 @@ linux-lts2017
 linux-lts2018
 linux-mainline
 linux-networktest
-linux-next
 linux-oracle
 linux-preempt-rt
 linux-steam-integration
@@ -2546,6 +2577,7 @@ lua52
 lualgi
 luarocks
 lutris
+lv2
 lxml
 lxqt-about
 lxqt-admin
@@ -2573,6 +2605,7 @@ make
 makedepend
 man-db
 man-pages
+man-pages-posix
 marble
 mariadb
 mash
@@ -2653,6 +2686,7 @@ msrestazure
 mstflint
 mtd-utils
 mtdev
+mtools
 mtr
 multidict
 multimon-ng
@@ -2665,6 +2699,162 @@ musl
 mutagen
 mutt
 mutter
+mvn-aether-core
+mvn-animal-sniffer
+mvn-antlr
+mvn-apache
+mvn-apache-jar-resource-bundle
+mvn-apache-rat
+mvn-asm
+mvn-autolink
+mvn-avalon-framework
+mvn-beanshell
+mvn-biz.aQute.bndlib
+mvn-bndlib
+mvn-build-helper-maven-plugin
+mvn-buildnumber-maven-plugin
+mvn-cdi-api
+mvn-checker-compat-qual
+mvn-checkstyle
+mvn-codehaus-jackson
+mvn-commons-cli
+mvn-commons-codec
+mvn-commons-collections
+mvn-commons-compress
+mvn-commons-httpclient
+mvn-commons-io
+mvn-commons-jxpath
+mvn-commons-lang
+mvn-commons-lang3
+mvn-commons-parent
+mvn-commons-validator
+mvn-decentxml
+mvn-doxia
+mvn-doxia-sitetools
+mvn-enforcer
+mvn-error_prone_annotations
+mvn-extra-enforcer-rules
+mvn-file-management
+mvn-google
+mvn-google-collections
+mvn-guava
+mvn-guice
+mvn-hamcrest
+mvn-httpcomponents-client
+mvn-httpcomponents-core
+mvn-j2objc-annotations
+mvn-jackson-databind
+mvn-jansi
+mvn-java-boot-classpath-detector
+mvn-javax.inject
+mvn-jaxb-impl
+mvn-jdom
+mvn-jersey-apache-client4
+mvn-jersey-core
+mvn-jersey-json
+mvn-jetty
+mvn-jetty-util
+mvn-jsch
+mvn-jsch.agentproxy.connector-factory
+mvn-jsch.agentproxy.sshagent
+mvn-jsch.agentproxy.svnkit-trilead-ssh2
+mvn-jsch.agentproxy.usocket-nc
+mvn-jsoup
+mvn-jsr250-api
+mvn-jsr305
+mvn-jsr311-api
+mvn-junit
+mvn-kxml2
+mvn-logback-classic
+mvn-logback-core
+mvn-maven-aether-provider
+mvn-maven-artifact
+mvn-maven-artifact-manager
+mvn-maven-builder-support
+mvn-maven-bundle-plugin
+mvn-maven-compat
+mvn-maven-core
+mvn-maven-embedder
+mvn-maven-error-diagnostics
+mvn-maven-model
+mvn-maven-model-builder
+mvn-maven-monitor
+mvn-maven-parent
+mvn-maven-plugin-api
+mvn-maven-plugin-descriptor
+mvn-maven-plugin-parameter-documenter
+mvn-maven-plugin-registry
+mvn-maven-plugin-testing
+mvn-maven-plugin-tools
+mvn-maven-profile
+mvn-maven-project
+mvn-maven-reporting-api
+mvn-maven-reporting-exec
+mvn-maven-reporting-impl
+mvn-maven-repository-metadata
+mvn-maven-resolver
+mvn-maven-resolver-provider
+mvn-maven-scm
+mvn-maven-settings
+mvn-maven-shared
+mvn-maven-slf4j-provider
+mvn-maven-surefire
+mvn-maven-toolchain
+mvn-mockito-core
+mvn-modello
+mvn-mojo-parent
+mvn-mvnplugins
+mvn-nekohtml
+mvn-nexus-maven-plugins
+mvn-nexus-public
+mvn-objenesis
+mvn-openhtmltopdf-core
+mvn-openhtmltopdf-jsoup-dom-converter
+mvn-org.apache.felix.bundlerepository
+mvn-org.eclipse.sisu.inject
+mvn-org.eclipse.sisu.plexus
+mvn-org.osgi.compendium
+mvn-org.osgi.core
+mvn-oro
+mvn-pdfbox
+mvn-plexus
+mvn-plexus-archiver
+mvn-plexus-build-api
+mvn-plexus-cipher
+mvn-plexus-classworlds
+mvn-plexus-cli
+mvn-plexus-compiler
+mvn-plexus-containers
+mvn-plexus-i18n
+mvn-plexus-interactivity
+mvn-plexus-interpolation
+mvn-plexus-io
+mvn-plexus-resources
+mvn-plexus-utils
+mvn-plexus-velocity
+mvn-protobuf-java
+mvn-servlet-api
+mvn-siesta
+mvn-sisu
+mvn-sisu-maven-plugin
+mvn-slf4j
+mvn-snappy
+mvn-sonatype-aether
+mvn-sonatype-plexus-sec-dispatcher
+mvn-spice-zapper
+mvn-sqljet
+mvn-sslext
+mvn-struts
+mvn-trilead-ssh2
+mvn-tycho
+mvn-validation-api
+mvn-velocity
+mvn-wagon
+mvn-xbean-reflect
+mvn-xercesImpl
+mvn-xercesMinimal
+mvn-xmlunit
+mvn-xmlunit-core
 mxnet
 mycroft-core
 mypaint-brushes
@@ -2713,6 +2903,7 @@ nghttp2
 nginx
 nginx-mainline
 nicstat
+nim
 ninja
 nload
 nlopt
@@ -2760,6 +2951,7 @@ ocl-icd
 octave
 offlineimap
 oiio
+okteta
 okular
 olefile
 onig
@@ -2924,6 +3116,7 @@ perl-B-Hooks-OP-Check
 perl-B-Keywords
 perl-BSD-Resource
 perl-Biblio-EndnoteStyle
+perl-Bit-Vector
 perl-Browser-Open
 perl-Business-ISBN
 perl-Business-ISBN-Data
@@ -2941,6 +3134,8 @@ perl-CSS-DOM
 perl-CSS-Minifier-XS
 perl-CSS-Tiny
 perl-Cache-Simple-TimedExpiry
+perl-Cairo
+perl-Cairo-GObject
 perl-Calendar-Simple
 perl-Canary-Stability
 perl-Capture-Tiny
@@ -3000,6 +3195,7 @@ perl-Curses
 perl-DBD-Pg
 perl-DBD-SQLite
 perl-DBD-SQLite2
+perl-DBD-mysql
 perl-DBI
 perl-DBICx-TestDatabase
 perl-DBIx-Class
@@ -3029,6 +3225,7 @@ perl-Data-Serializer
 perl-Data-Structure-Util
 perl-Data-Uniqid
 perl-Data-Validate-IP
+perl-Date-Manip
 perl-DateTime
 perl-DateTime-Format-Builder
 perl-DateTime-Format-DateParse
@@ -3090,6 +3287,7 @@ perl-ExtUtils-Config
 perl-ExtUtils-Depends
 perl-ExtUtils-Helpers
 perl-ExtUtils-InstallPaths
+perl-ExtUtils-PkgConfig
 perl-FCGI-ProcManager
 perl-Feed-Find
 perl-Fennec-Lite
@@ -3137,7 +3335,11 @@ perl-Geo-IPfree
 perl-Getopt-Euclid
 perl-Getopt-Tabular
 perl-Git-Version-Compare
+perl-Glib
+perl-Glib-Object-Introspection
 perl-Graph
+perl-Gtk3
+perl-Gtk3-WebKit
 perl-Guard
 perl-HTML-Clean
 perl-HTML-Encoding
@@ -3200,6 +3402,7 @@ perl-Inline-C
 perl-JSON
 perl-JSON-MaybeXS
 perl-JSON-RPC
+perl-JSON-XS
 perl-JavaScript-Minifier-XS
 perl-LWP-MediaTypes
 perl-LWP-Protocol-https
@@ -3284,6 +3487,7 @@ perl-Moose
 perl-MooseX-Role-Parameterized
 perl-MooseX-Role-WithOverloading
 perl-Mozilla-CA
+perl-Net-Bluetooth
 perl-Net-CIDR-Lite
 perl-Net-DBus
 perl-Net-DNS
@@ -3363,6 +3567,7 @@ perl-Role-Basic
 perl-Role-Tiny
 perl-Roman
 perl-Router-Simple
+perl-SGLMSpm
 perl-SMTP-Server
 perl-SQL-Abstract
 perl-SQL-Translator
@@ -3440,6 +3645,7 @@ perl-Test-MockTime
 perl-Test-More-UTF8
 perl-Test-Most
 perl-Test-Needs
+perl-Test-NeedsDisplay
 perl-Test-NoWarnings
 perl-Test-Number-Delta
 perl-Test-Output
@@ -3468,6 +3674,7 @@ perl-Text-Brew
 perl-Text-CSV
 perl-Text-CSV-Encoded
 perl-Text-CSV_XS
+perl-Text-CharWidth
 perl-Text-Diff
 perl-Text-FindIndent
 perl-Text-Format
@@ -3483,6 +3690,7 @@ perl-Text-TabularDisplay
 perl-Text-Template
 perl-Text-Trim
 perl-Text-Unidecode
+perl-Text-WrapI18N
 perl-Text-Wrapper
 perl-Tie-Cycle
 perl-Tie-IxHash
@@ -3510,6 +3718,7 @@ perl-Unicode-Map
 perl-Variable-Magic
 perl-WWW-Form-UrlEncoded-XS
 perl-WWW-RobotRules
+perl-X11-IdleTime
 perl-X11-Protocol
 perl-XML-Atom
 perl-XML-Feed
@@ -3558,6 +3767,7 @@ persistent
 pesign
 pexpect
 phonon
+phonon-vlc
 phoronix-test-suite
 php
 php-imagick
@@ -3687,6 +3897,7 @@ pygtkglext
 pyhs100
 pyinotify
 pykerberos
+pykwalify
 pylama
 pyliblzma
 pylint
@@ -3732,6 +3943,7 @@ python-crfsuite
 python-dateutil
 python-dateutil-legacypython
 python-designateclient
+python-distutils-extra
 python-dldt
 python-editor
 python-future
@@ -3795,6 +4007,7 @@ qemu
 qemu-guest-additions
 qemu-lite
 qgit
+qhull
 qml-box2d
 qpdf
 qpid-python
@@ -3845,6 +4058,8 @@ quazip
 quilt
 qwt
 rabbitmq-c
+rabbitmq-java-client
+rabbitmq-java-client-dep
 rabbitmq-server
 radvd
 rage
@@ -3903,9 +4118,10 @@ rsync
 rsyslog
 rt-tests
 rtkit
+rtmpdump
 rtslib-fb
 rttr
-ruamel-yaml
+ruamel.yaml
 ruby
 runc
 rust-std32
@@ -3924,6 +4140,7 @@ sbc
 sbsigntools
 scala
 scala-dep
+scdoc
 scene-alembic
 scikit-build
 scikit-image
@@ -3957,6 +4174,7 @@ setuptools_scm_git_archive
 setxkbmap
 sg3_utils
 shadow
+shapelib
 shared-mime-info
 sharutils
 shell
@@ -4037,6 +4255,7 @@ stellarium
 step
 stestr
 stevedore
+stoken
 stow
 strace
 stress-ng
@@ -4088,6 +4307,7 @@ telemetrics-client
 telepathy-glib
 telepathy-logger
 telepathy-qt
+tempest
 tempest-lib
 template-glib
 tempora
@@ -4102,6 +4322,7 @@ terminaltables
 terminology
 terminus-font
 test-generator
+testdisk
 testpath
 testrepository
 testresources
@@ -4156,12 +4377,13 @@ tracker-miners
 traitlets
 tree
 trollius
-typed-ast
+typed_ast
 typing
 typing_extensions
 tzdata
 tzlocal
 ua-parser
+uamqp
 ucpp
 udisks2
 udunits
@@ -4215,6 +4437,7 @@ volk
 volume_key
 voluptuous
 voluptuous-serialize
+vpnc
 vsqlite
 vte
 waffle
@@ -4311,6 +4534,7 @@ xkbcomp
 xkeyboard-config
 xkill
 xlog
+xmlb
 xmlrpc-c
 xmlsec1
 xmlstarlet
@@ -4353,14 +4577,17 @@ yum
 yum-metadata-parser
 zVMCloudConnector
 zake
+zathura
 zc.lockfile
 zenity
 zeroconf
 zeroconf-ioslave
 zict
 zip
+zipp
 zlib
 znc
+zoneminder
 zookeeper-dep
 zope.component
 zope.configuration

patchfilter.py

@@ -195,7 +195,7 @@ def main():
         with open (filename, "r") as myfile:
             lines = myfile.readlines()
     else:
-        output = subprocess.check_output("git show", shell=True).decode("latin-1")
+        output = subprocess.check_output("git format-patch -1 --stdout", shell=True).decode("latin-1")
         lines = output.split("\n")
         
     parse_patch(lines)
@@ -225,6 +225,14 @@ def main():
     zap_line_in_file_start(".spec", "Source99 :")
     zap_line_in_file_start(".spec", "Source0  :")
     zap_line_in_file_start(".spec", "export SOURCE_DATE_EPOCH")
+    zap_line_in_file_start(".spec", "export GCC_IGNORE_WERROR=1")
+    zap_line_in_file_start(".spec", "export AR=gcc-ar")
+    zap_line_in_file_start(".spec", "export RANLIB=gcc-ranlib")
+    zap_line_in_file_start(".spec", "export NM=gcc-nm")
+    zap_line_in_file_start(".spec", "export CFLAGS=\"$CFLAGS -O3 -ffat-lto-objects -flto=4 \"")
+    zap_line_in_file_start(".spec", "export FCFLAGS=\"$CFLAGS -O3 -ffat-lto-objects -flto=4 \"")
+    zap_line_in_file_start(".spec", "export FFLAGS=\"$CFLAGS -O3 -ffat-lto-objects -flto=4 \"")
+    zap_line_in_file_start(".spec", "export CXXFLAGS=\"$CXXFLAGS -O3 -ffat-lto-objects -flto=4 \"")
     zap_line_in_file_start(".spec", "%setup -q -n ")
     zap_line_in_file_start(".spec", "URL      :")
     zap_line_in_file_start(".spec", "Version  :")
@@ -236,6 +244,7 @@ def main():
     zap_line_in_file_start(".spec", "data components for the")
     zap_line_in_file_start(".spec", "locales components for the")
     zap_line_in_file_start(".spec", "license components for the")
+    zap_line_in_file_start(".spec", "doc components for the")
     zap_line_in_file_start(".spec", "Group: Default")
     zap_line_in_file_start(".spec", "export http_proxy=http://127.0.0.1:9/")
     zap_line_in_file_start(".spec", "export https_proxy=http://127.0.0.1:9/")
@@ -246,13 +255,16 @@ def main():
     zap_line_in_file_start(".spec", "Group: Binaries")
     zap_line_in_file_start(".spec", "Group: Data")
     zap_line_in_file_start(".spec", "Group: Libraries")
+    zap_line_in_file_start(".spec", "Group: Documentation")
     zap_line_in_file_start(".spec", "export LANG=C")
     zap_line_in_file_start(".spec", "%description lib")
     zap_line_in_file_start(".spec", "%description bin")
     zap_line_in_file_start(".spec", "%description data")
+    zap_line_in_file_start(".spec", "%description doc")
     zap_line_in_file_start(".spec", "%description locales")
     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("b/Makefile", "URL =")
     zap_line_in_file_start("b/Makefile", "PKG_NAME :=")