Use the higher tag when there are more than one

If two or more tags of the right format point point to HEAD, we probably want the later of the two.
2025-12-11 17:40:31 +08:00 · 2013-08-20 21:44:29 -05:00
28 changed files with 44 additions and 156 deletions
--- a/2
+++ b/2
@@ -1,5 +1,5 @@
 # Get the version name first by seeing if HEAD is tagged
-version := $(shell git tag --points-at HEAD -l '0.*.*' | head -1)
+version := $(shell git tag --points-at HEAD -l '0.*.*' | sort -r | head -1)
 # And if it wasn't use a git hash
 ifeq ($(version),)
  version := $(shell git log -1 --abbrev=8 --pretty=git%h)
--- a/fedora-arm-base.ks
+++ b/fedora-arm-base.ks
@@ -4,9 +4,6 @@ auth --useshadow --enablemd5
 selinux --enforcing
 firewall --enabled --service=mdns,ssh
 # configure extlinux bootloader
 bootloader extlinux
 # make sure that initial-setup runs and lets us do all the configuration bits
 firstboot --reconfig
@@ -25,7 +22,6 @@ kernel-lpae
 chrony
 arm-boot-config
 extlinux-bootloader
 initial-setup
 #lets resize / on first boot
 dracut-modules-growroot
--- a/fedora-arm-desktop-vfat.ks
+++ b/fedora-arm-desktop-vfat.ks
@@ -3,8 +3,6 @@
 %include fedora-desktop-packages.ks
 %include fedora-arm-vfat-partitioning.ks
 part / --size=4000 --fstype ext4
 %packages
 -initial-setup
--- a/fedora-arm-desktop.ks
+++ b/fedora-arm-desktop.ks
@@ -3,8 +3,6 @@
 %include fedora-desktop-packages.ks
 %include fedora-arm-partitioning.ks
 part / --size=4000 --fstype ext4
 %packages
 -initial-setup
--- a/fedora-arm-kde-vfat.ks
+++ b/fedora-arm-kde-vfat.ks
@@ -3,8 +3,6 @@
 %include fedora-kde-packages.ks
 %include fedora-arm-vfat-partitioning.ks
 part / --size=4000 --fstype ext4
 %post
 echo -n "Enabling initial-setup gui mode on startup"
 ln -s /usr/lib/systemd/system/initial-setup-graphical.service /etc/systemd/system/graphical.target.wants/initial-setup-graphical.service
--- a/fedora-arm-kde.ks
+++ b/fedora-arm-kde.ks
@@ -3,7 +3,7 @@
 %include fedora-kde-packages.ks
 %include fedora-arm-partitioning.ks
-part / --size=4000 --fstype ext4
+part / --size=3400 --fstype ext4
 %post
 echo -n "Enabling initial-setup gui mode on startup"
--- a/fedora-arm-mate-vfat.ks
+++ b/fedora-arm-mate-vfat.ks
@@ -3,7 +3,7 @@
 %include fedora-mate-packages.ks
 %include fedora-arm-vfat-partitioning.ks
-part / --size=5000 --fstype ext4
+part / --size=4000 --fstype ext4
 %post
 echo -n "Enabling initial-setup gui mode on startup"
--- a/fedora-arm-mate.ks
+++ b/fedora-arm-mate.ks
@@ -3,7 +3,7 @@
 %include fedora-mate-packages.ks
 %include fedora-arm-partitioning.ks
-part / --size=5000 --fstype ext4
+part / --size=4000 --fstype ext4
 %post
 echo -n "Enabling initial-setup gui mode on startup"
--- a/fedora-arm-minimal-vfat.ks
+++ b/fedora-arm-minimal-vfat.ks
@@ -1,9 +1,6 @@
 %include fedora-arm-base.ks
 %include fedora-arm-vfat-partitioning.ks
 part swap --size=128 --fstype swap
 part / --size=1400 --fstype ext4
 %post
 # setup systemd to boot to the right runlevel
--- a/fedora-arm-minimal.ks
+++ b/fedora-arm-minimal.ks
@@ -1,9 +1,6 @@
 %include fedora-arm-base.ks
 %include fedora-arm-partitioning.ks
 part swap --size=128 --fstype swap
 part / --size=1400 --fstype ext4
 %post
 # setup systemd to boot to the right runlevel
--- a/fedora-arm-partitioning.ks
+++ b/fedora-arm-partitioning.ks
@@ -1,3 +1,4 @@
 bootloader --location=none
 part /boot --size=512 --fstype ext3
 part swap --size=512 --fstype swap
 part / --size=3000 --fstype ext4
--- a/fedora-arm-vfat-partitioning.ks
+++ b/fedora-arm-vfat-partitioning.ks
@@ -1,3 +1,4 @@
 bootloader --location=none
 part /boot/uboot --size=20 --fstype vfat
 part swap --size=512 --fstype swap
 part / --size=3400 --fstype ext4
--- a/fedora-desktop-packages.ks
+++ b/fedora-desktop-packages.ks
@@ -20,12 +20,4 @@ nss-mdns
 # https://lists.fedoraproject.org/pipermail/devel/2013-July/186796.html
 -rsyslog
 # Remove a few apps that are being presented as featured apps in
 # gnome-software
 -transmission-gtk
 -simple-scan
 -gnome-photos
 -gnome-maps
 -gnome-weather
 %end
--- a/fedora-install-fedora.ks
+++ b/fedora-install-fedora.ks
@@ -16,12 +16,12 @@
 # use the source repo, we can't just include fedora-repo.ks
 # In the master branch the rawhide repo commands should be uncommented.
-#repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch
+repo --name=rawhide --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide&arch=$basearch
-#repo --name=rawhide-source  --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$basearch
+repo --name=rawhide-source  --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=rawhide-source&arch=$basearch
 # In non-master branches the fedora repo commands should be uncommented
-repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch
+#repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch
-repo --name=fedora-source  --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&arch=$basearch
+#repo --name=fedora-source  --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-source-$releasever&arch=$basearch
 # Package manifest for the compose.  Uses repo group metadata to translate groups.
 # (default groups for the configured repos are added by --default)
@@ -144,7 +144,6 @@ kde-l10n-*
 libreoffice-langpack-*
 man-pages-*
 mythes-*
 -gimp-help-*
 # Removals
 -PackageKit-zif
--- a/fedora-live-base.ks
+++ b/fedora-live-base.ks
@@ -205,10 +205,6 @@ systemctl stop atd.service 2> /dev/null || :
 # Mark things as configured
 touch /.liveimg-configured
 # add static hostname to work around xauth bug
 # https://bugzilla.redhat.com/show_bug.cgi?id=679486
 echo "localhost" > /etc/hostname
 EOF
 # bah, hal starts way too late
--- a/fedora-live-design-suite.ks
+++ b/fedora-live-design-suite.ks
@@ -39,7 +39,6 @@ nautilus-image-converter
 optipng
 phatch
 screenruler
 simple-scan
 scribus
 colord-extra-profiles 
 synfigstudio
@@ -72,7 +71,7 @@ overpass-fonts
 -gthumb
 -eog
 -gnome-photos
-rdesktop
+
 # Legacy cmdline things we don't want
 -krb5-auth-dialog
@@ -103,7 +102,7 @@ cat >> /usr/share/glib-2.0/schemas/org.gnome.shell.gschema.override << FOE
 [org.gnome.shell]
 favorite-apps=['firefox.desktop', 'evolution.desktop', 'shotwell.desktop', 'gimp.desktop', 'inkscape.desktop', 'blender.desktop', 'libreoffice-writer.desktop', 'scribus.desktop', 'nautilus.desktop', 'bijiben.desktop', 'anaconda.desktop']
 #Enable categories in Gnome Shell
-app-folder-categories=['Utilities', 'Sundry', 'Office', 'Network', 'Internet', 'Graphics', 'Games', 'Multimedia', 'System', 'Development', 'Accessories', 'System Settings', 'Other']
+app-folder-categories=['Utilities','Others','System Settings','Sundry','Graphics','Games','Office','Multimedia','Network','Internet']
 FOE
 # Add link to the Inkscape Course
@@ -119,22 +118,6 @@ Categories=Graphics;Documentation;
 FOE
 chmod a+x /usr/share/applications/inkscape-course.desktop
 <<<<<<< HEAD
 =======
 # Add link to the list of design tutorials
 cat >> /usr/share/applications/list-design-tutorials.desktop << FOE
 [Desktop Entry]
 Name=List of design tutorials
 GenericName=Design tutorials
 Comment=List of websites using open source design software
 Exec=xdg-open https://fedoraproject.org/wiki/Design_Suite/Tutorials
 Type=Application
 Icon=applicatons-graphics
 Categories=Graphics;Documentation;
 FOE
 chmod a+x /usr/share/applications/list-design-tutorials.desktop
 >>>>>>> 6d05550... design: fix link for tutorials
 # rebuild schema cache with any overrides we installed
 glib-compile-schemas /usr/share/glib-2.0/schemas
--- a/fedora-live-jam-kde.ks
+++ b/fedora-live-jam-kde.ks
@@ -81,9 +81,6 @@ seq24
 muse
 qtractor
 non-session-manager
 non-daw
 non-sequencer
 non-mixer
 # audio-plugins
 calf
--- a/fedora-live-kde-base.ks
+++ b/fedora-live-kde-base.ks
@@ -40,11 +40,12 @@ chmod a+x /home/liveuser/.xsession
 chown liveuser:liveuser /home/liveuser/.xsession
 # set up autologin for user liveuser
-sed -i 's/^AutoUser=.*/AutoUser=liveuser/' /etc/sddm.conf
+sed -i 's/#AutoLoginEnable=true/AutoLoginEnable=true/' /etc/kde/kdm/kdmrc
 sed -i 's/#AutoLoginUser=fred/AutoLoginUser=liveuser/' /etc/kde/kdm/kdmrc
 # set up user liveuser as default user and preselected user
-sed -i 's/^LastUser=.*/LastUser=liveuser/' /etc/sddm.conf
+sed -i 's/#PreselectUser=Default/PreselectUser=Default/' /etc/kde/kdm/kdmrc
-sed -i 's/^LastSession=.*/LastSession=kde-plasma.desktop/' /etc/sddm.conf
+sed -i 's/#DefaultUser=johndoe/DefaultUser=liveuser/' /etc/kde/kdm/kdmrc
 # add liveinst.desktop to favorites menu
 mkdir -p /home/liveuser/.kde/share/config/
--- a/fedora-live-kde.ks
+++ b/fedora-live-kde.ks
@@ -2,7 +2,7 @@
 #
 # Description:
 # - Fedora Live Spin with the K Desktop Environment (KDE), 2 GiB version
-#   see fedora-livecd-kde.ks for the default 1 GiB version
+#   see fedora-livecd-kde.ks for the default CD-sized version
 #
 # Maintainer(s):
 # - Sebastian Vahl <fedora@deadbabylon.de>
--- a/fedora-livecd-desktop.ks
+++ b/fedora-livecd-desktop.ks
@@ -90,8 +90,6 @@
 -gnu-free-mono-fonts
 -gnu-free-sans-fonts
 -gnu-free-serif-fonts
 -uboot-tools
 -dtc
 # Without gnu freefonts, the lack of Malayalam coverage is
 # a problem in anaconda (#977764)
--- a/fedora-livecd-kde.ks
+++ b/fedora-livecd-kde.ks
@@ -1,7 +1,7 @@
 # fedora-livecd-kde.ks
 #
 # Description:
-# - Fedora Live Spin with the K Desktop Environment (KDE), default 1 GiB version
+# - Fedora Livecd Spin with the K Desktop Environment (KDE)
 #
 # Maintainer(s):
 # - Sebastian Vahl <fedora@deadbabylon.de>
@@ -10,9 +10,6 @@
 %include fedora-live-kde-base.ks
 %include fedora-live-minimization.ks
 # DVD payload
 part / --size=4096
 %packages
 # unwanted packages from @kde-desktop
--- a/fedora-livecd-security.ks
+++ b/fedora-livecd-security.ks
@@ -18,9 +18,6 @@
 %include fedora-live-base.ks
 %include fedora-live-minimization.ks
 # spin was failing to compose due to lack of space, so bumping the size.
 part / --size 10240
 %packages
@xfce-desktop
@xfce-apps
@@ -53,25 +50,14 @@ security-menus
 # exclude some packages to save some space
 # use './fsl-maintenance.py -l' in your security spin git folder to build
 -ArpON
 -aide
 -binwalk
 -bkhive
 -bonesi
 -bro
 -cmospwd
 -dnstop
 -etherape
 -hfsutils
-httpie
+-honeyd
 -httrack
 -hydra
 -kismon
 -labrea
 -nebula
 -netsed
 -onesixtyone
 -packETH
 -pads
 -pdfcrack
 -picviz-gui
 -prelude-lml
@@ -80,11 +66,8 @@ security-menus
 -proxychains
 -pyrit
 -raddump
 -rkhunter
 -safecopy
 -samdump2
 -scalpel
 -sshscan
 -sslstrip
 -tcpreen
 -tcpreplay
--- a/fedora-livecd-soas.ks
+++ b/fedora-livecd-soas.ks
@@ -83,16 +83,6 @@ gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults
 # Enable Sugar power management
 gconftool-2 --direct --config-source=xml:readwrite:/etc/gconf/gconf.xml.defaults -s -t bool /desktop/sugar/power/automatic True >/dev/null
 cat >> /etc/rc.d/init.d/livesys << EOF
 # set up lightdm autologin
 sed -i 's/^#autologin-user=.*/autologin-user=liveuser/' /etc/lightdm/lightdm.conf
 sed -i 's/^#autologin-user-timeout=.*/autologin-user-timeout=0/' /etc/lightdm/lightdm.conf
 #sed -i 's/^#show-language-selector=.*/show-language-selector=true/' /etc/lightdm/lightdm-gtk-greeter.conf
 # set Sugar as default session, otherwise login will fail
 sed -i 's/^#user-session=.*/user-session=sugar/' /etc/lightdm/lightdm.conf
 EOF
 cat >> /etc/rc.d/init.d/livesys-late << EOF
 # disable screensaver locking
--- a/fedora-livedvd-electronic-lab.ks
+++ b/fedora-livedvd-electronic-lab.ks
@@ -7,7 +7,7 @@
 %include fedora-livecd-desktop.ks
 # DVD payload
-part / --size 10240
+part / --size=8192
 %packages
@@ -49,8 +49,7 @@ perl-Test-Pod-Coverage
 -gimp-libs
 -gimp-data-extras
 -kdebluetooth
-kbluetooth
+
 -rdesktop
 %end
--- a/fedora-livedvd-scientific-kde.ks
+++ b/fedora-livedvd-scientific-kde.ks
@@ -10,10 +10,12 @@
 # Maintainer: Amit Saha <amitksaha@fedoraproject.org>
 #             https://fedoraproject.org/wiki/User:Amitksaha
 # Last modified: March 10, 2012.
 %include fedora-live-kde.ks
-# The recommended part size for DVDs is too close to use for the scientific spin
+# DVD payload
-part / --size 12288
+part / --size 10000
 %packages
@@ -25,11 +27,6 @@ scilab
 scilab-devel
 scilab-doc
 # sagemath
 # BZ #1006230 should fix this
 sagemath
 sagemath-notebook
 #Devel tools
 #Install the mandatory packages from dev-tools and dev-libs
@@ -38,41 +35,14 @@ sagemath-notebook
@development-libs
@c-development
@rpm-development-tools
 #others, not included
 # C++ libraries
 blitz-devel
 armadillo-devel
 # Misc. related utils
 ddd
 valgrind
-
+ipython
 #python 2 tools/libraries not included from the groups
 python-ipython
 python-ipython-console
 python-ipython-notebook
 sympy
 python-networkx
 #python 3 and tools/libraries not included from the groups
 python3
 python3-matplotlib
 python3-scipy
 python3-numpy
 python3-ipython
 python3-ipython-console
 python3-ipython-notebook
 python3-networkx
 # matplotlib backends
 python-matplotlib-qt4
 python-matplotlib-tk
 python3-matplotlib-qt4
 python3-matplotlib-tk
 # Include Java development tools
@java-development
 apache-commons-math
 #fortran compiler
 gcc-gfortran
@@ -84,7 +54,7 @@ rkward
 qtoctave
 # IDEs for the IDE folks
-@eclipse
+eclipse
 spyder
 #writing & publishing
@@ -101,22 +71,21 @@ kile
 BibTool
 pdfshuffler
 # Parallel/Distributed computing libraries/tools
 openmpi
 openmpi-devel
 valgrind-openmpi
 pvm
 pvm-gui #will install 'pvm' as well
 libgomp
 python-pp
-mpi4py-openmpi
+
 python3-mpi4py-openmpi
 #Version control- a GUI for each as well
 # Installing rapidsvn will also install subversion package
 rapidsvn 
-git
+# Install git-gui, will also install git
 git-gui
 # Mercurial
 mercurial
@@ -125,6 +94,7 @@ mercurial-hgk
 #Backup Utilities
 backintime-kde
 #needs to install this specifically because of some conflict between openmpi
 #and emacs (http://lists.fedoraproject.org/pipermail/devel/2011-July/153812.html)
 libotf
@@ -135,13 +105,13 @@ root-gui-fitpanel
 root-python
 #Multiple jobs/clustering system
-# torque
+torque
-# torque-server
+torque-server
-# torque-scheduler
+torque-scheduler
-# torque-gui
+torque-gui
-# torque-libs
+torque-libs
-# torque-mom
+torque-mom
-# python-pbs
+python-pbs
 #Drawing, Picture viewing tools, Visualization tools
 dia
@@ -155,9 +125,8 @@ Mayavi
 #Misc. Utils
 screen
 tmux
 rlwrap
-hexchat
+xchat
 shutter
 fig2ps
 bibtex2html
--- a/fedora-repo-not-rawhide.ks
+++ b/fedora-repo-not-rawhide.ks
@@ -1,3 +1,3 @@
 repo --name=fedora --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=fedora-$releasever&arch=$basearch
-repo --name=updates --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-f$releasever&arch=$basearch
+repo --name=updates --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-released-$releasever&arch=$basearch
-#repo --name=updates-testing --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-f$releasever&arch=$basearch
+#repo --name=updates-testing --mirrorlist=http://mirrors.fedoraproject.org/mirrorlist?repo=updates-testing-$releasever&arch=$basearch
--- a/fedora-repo.ks
+++ b/fedora-repo.ks
@@ -3,7 +3,7 @@
 # Exactly one of the following should be uncommented
 # For the master branch the following should be uncommented
-#%include fedora-repo-rawhide.ks
+%include fedora-repo-rawhide.ks
 # For non-master branches the following should be uncommented
-%include fedora-repo-not-rawhide.ks
+# %include fedora-repo-non-rawhide.ks
--- a/fedora-soas-packages.ks
+++ b/fedora-soas-packages.ks
@@ -34,8 +34,6 @@
@sugar-desktop
 -sugar-ruler
 sugar-cp-updater
 lightdm
 lightdm-gtk
 # Write breaks unless we do this (we don't need it anyway)
 # enable for testing in the F17 dev cycle