Modify Makefile to produce git log on make dist

ChangeLog

@@ -1,6 +1,15 @@
+Changes in version 2.2.22 <silvan.calarco@mambasoft.it> 20110602
+- see git log
+---------------------------------------------------------------------------------
+
+Changes in version 2.2.21 <silvan.calarco@mambasoft.it> 20110522
+- see git log
+---------------------------------------------------------------------------------
+
 Changes in version 2.2.20 <silvan.calarco@mambasoft.it> 20110426
 - openmamba-update: moved from openmamba-release package
 - openmamba-netsrpms: new name of netsrpminstall.sh script with multiple package and automatic update support
+- git tag test
 ---------------------------------------------------------------------------------
 
 Changes in version 2.2.19 <silvan.calarco@mambasoft.it> 20110423

Makefile

@@ -166,6 +166,7 @@ install-kde-distro-addons: dist-update
 	@$(INSTALL_DIR) $(DESTDIR)$(kdewallpapersdir)
 	@$(INSTALL_DIR) $(DESTDIR)$(mambaimagesdir)
 	cp -r etc/polkit-1 $(DESTDIR)$(sysconfdir)/
+	cp -r etc/prelink.conf.d $(DESTDIR)$(sysconfdir)/
 	$(INSTALL_SCRIPT) kde/scripts/showlog $(DESTDIR)$(distrobindir)
 	cp -r menu/icons/ $(DESTDIR)$(datadir)/icons/
 	cp -r kde/apps $(DESTDIR)$(kdedatadir)
@@ -176,7 +177,7 @@ install-kde-distro-addons: dist-update
 	$(INSTALL_DATA) kde/wallpapers/$(WALLPAPER).desktop $(DESTDIR)$(kdewallpapersdir)
 	$(INSTALL_DATA) kde/wallpapers/{$(WALLPAPERS)} $(DESTDIR)$(kdewallpapersdir)
 	$(INSTALL_DATA) kde/wallpapers/{$(COMPIZ_WALLPAPERS)} $(DESTDIR)$(mambaimagesdir)
-	$(INSTALL_SCRIPT) kde/bin/konsole-nofork $(DESTDIR)$(kde4bindir)
+#	$(INSTALL_SCRIPT) kde/bin/konsole-nofork $(DESTDIR)$(kde4bindir)
 
 install-distromenu: dist-update
 	@$(INSTALL_DIR) $(DESTDIR)$(xdg_directorydir)
@@ -284,12 +285,7 @@ install: $(pck_infiles:.in=) \
 	install-apt-extras
 
 dist: clean
-	@case `sed 15q ChangeLog` in \
+	@git log > ChangeLog.git
-	*"$(VERSION)"*) : ;; \
-	*) \
-	   echo "ChangeLog not updated; not releasing" 1>&2;\
-	   exit 1;; \
-	esac
 	@mkdir /tmp/$(distdir)
 	@cp -a * /tmp/$(distdir)/
 	@rm -f $(dist_archive);\

SRPMS/msttcorefonts/distroutils.sysconfig

@@ -7,6 +7,7 @@ HAS_MS_LICENSE=no
 
 # Select the server that is closest to you by removing the '#'
 # character in one of the following lines:
+MSTTCF_URL=http://mesh.dl.sourceforge.net/project/corefonts/the%20fonts/final/
 #MSTTCF_URL=http://aleron.dl.sourceforge.net/sourceforge/corefonts
 #MSTTCF_URL=http://belnet.dl.sourceforge.net/sourceforge/corefonts
 #MSTTCF_URL=http://cesnet.dl.sourceforge.net/sourceforge/corefonts
@@ -15,5 +16,5 @@ HAS_MS_LICENSE=no
 #MSTTCF_URL=http://twtelecom.dl.sourceforge.net/sourceforge/corefonts
 #MSTTCF_URL=http://unc.dl.sourceforge.net/sourceforge/corefonts
 #MSTTCF_URL=http://umn.dl.sourceforge.net/sourceforge/corefonts
-MSTTCF_URL=http://easynews.dl.sourceforge.net/sourceforge/corefonts/
+#MSTTCF_URL=http://easynews.dl.sourceforge.net/sourceforge/corefonts/
 

SRPMS/msttcorefonts/msttcorefonts.spec.in

@@ -14,7 +14,7 @@
 
 Name:          %{name}
 Version:       1.3
-Release:       5@distroext@
+Release:       7@distroext@
 Summary:       TrueType core fonts for the web
 Group:         Graphical Desktop/Fonts
 Vendor:        @vendor@
@@ -30,11 +30,7 @@ BuildArch:     noarch
 BuildRoot:     %{_tmppath}/%{name}-%{version}-root
 
 %description
-The TrueType core fonts for the web that was once available from
+The TrueType core fonts for the web that was once available from http://www.microsoft.com/typography/fontpack/. The src rpm is cleverly constructed so that the actual fonts are downloaded from Sourceforge's site at build time. Therefore this package technically does not 'redistribute' the fonts, it just makes it easy to install them on a linux system.
-http://www.microsoft.com/typography/fontpack/. The src rpm is cleverly
-constructed so that the actual fonts are downloaded from Sourceforge's site
-at build time. Therefore this package technically does not 'redistribute'
-the fonts, it just makes it easy to install them on a linux system.
 
 %prep
 rm -rf %{name}
@@ -101,6 +97,10 @@ exit 0
 %dir %{fontdir}
 
 %changelog
+* Wed Jun 01 2011 Silvan Calarco <silvan.calarco@mambasoft.it> 1.3-7mamba
+- retry times raised to 5
+- replace use of wget with curl
+
 * Fri Feb 02 2007 Davide Madrisan <davide.madrisan@qilinux.it> 1.3-6qilnx
 - get download parameters from a sysconfig file
 

VERSION

@@ -1,2 +1,2 @@
-VERSION = 2.2.20
+VERSION = 2.2.23
 

mambabase/mambabase.kmdr

@@ -229,7 +229,7 @@
                     </font>
                 </property>
                 <property name="text">
-                    <string>Copyright (c) 2007-2010 by mambaSoft di Silvan Calarco
+                    <string>Copyright (c) 2007-2011 by mambaSoft di Silvan Calarco
 Released under the terms of the GNU GPL v3 license</string>
                 </property>
                 <property name="textFormat">
@@ -277,53 +277,6 @@ Released under the terms of the GNU GPL v3 license</string>
             <property name="title">
                 <string></string>
             </property>
-            <widget class="ExecButton">
-                <property name="name">
-                    <cstring>checkButton</cstring>
-                </property>
-                <property name="geometry">
-                    <rect>
-                        <x>290</x>
-                        <y>190</y>
-                        <width>130</width>
-                        <height>30</height>
-                    </rect>
-                </property>
-                <property name="text">
-                    <string>C&amp;heck again</string>
-                </property>
-                <property name="associations" stdset="0">
-                    <stringlist>
-                        <string></string>
-                    </stringlist>
-                </property>
-            </widget>
-            <widget class="Label">
-                <property name="name">
-                    <cstring>errorlabel</cstring>
-                </property>
-                <property name="geometry">
-                    <rect>
-                        <x>10</x>
-                        <y>110</y>
-                        <width>550</width>
-                        <height>70</height>
-                    </rect>
-                </property>
-                <property name="font">
-                    <font>
-                    </font>
-                </property>
-                <property name="text">
-                    <string></string>
-                </property>
-                <property name="textFormat">
-                    <enum>AutoText</enum>
-                </property>
-                <property name="alignment">
-                    <set>WordBreak|AlignBottom</set>
-                </property>
-            </widget>
             <widget class="Label">
                 <property name="name">
                     <cstring>Label7</cstring>
@@ -351,29 +304,6 @@ Released under the terms of the GNU GPL v3 license</string>
                     <set>WordBreak|AlignTop</set>
                 </property>
             </widget>
-            <widget class="ExecButton">
-                <property name="name">
-                    <cstring>ConfigureButton</cstring>
-                </property>
-                <property name="geometry">
-                    <rect>
-                        <x>150</x>
-                        <y>190</y>
-                        <width>130</width>
-                        <height>30</height>
-                    </rect>
-                </property>
-                <property name="text">
-                    <string>Conf&amp;igure</string>
-                </property>
-                <property name="associations" stdset="0">
-                    <stringlist>
-                        <string>@exec("wicd-client -n")
-@checknetwork.execute()
-</string>
-                    </stringlist>
-                </property>
-            </widget>
             <widget class="Label">
                 <property name="name">
                     <cstring>label</cstring>
@@ -400,6 +330,53 @@ Released under the terms of the GNU GPL v3 license</string>
                     <set>WordBreak|AlignBottom</set>
                 </property>
             </widget>
+            <widget class="Label">
+                <property name="name">
+                    <cstring>errorlabel</cstring>
+                </property>
+                <property name="geometry">
+                    <rect>
+                        <x>10</x>
+                        <y>110</y>
+                        <width>550</width>
+                        <height>70</height>
+                    </rect>
+                </property>
+                <property name="font">
+                    <font>
+                    </font>
+                </property>
+                <property name="text">
+                    <string></string>
+                </property>
+                <property name="textFormat">
+                    <enum>AutoText</enum>
+                </property>
+                <property name="alignment">
+                    <set>WordBreak|AlignBottom</set>
+                </property>
+            </widget>
+            <widget class="ExecButton">
+                <property name="name">
+                    <cstring>checkButton</cstring>
+                </property>
+                <property name="geometry">
+                    <rect>
+                        <x>220</x>
+                        <y>190</y>
+                        <width>130</width>
+                        <height>30</height>
+                    </rect>
+                </property>
+                <property name="text">
+                    <string>C&amp;heck again</string>
+                </property>
+                <property name="associations" stdset="0">
+                    <stringlist>
+                        <string></string>
+                    </stringlist>
+                </property>
+            </widget>
         </widget>
         <widget class="ScriptObject">
             <property name="name">
@@ -424,7 +401,6 @@ dcop @dcopid KommanderIf setChecked BackBox false
 RET=$?
 if [ $RET -eq 0 ]; then
    dcop @dcopid KommanderIf setVisible checkButton false
-   dcop @dcopid KommanderIf setVisible ConfigureButton false
    dcop @dcopid KommanderIf setChecked NextBox true
    dcop @dcopid KommanderIf setVisible label true
    dcop @dcopid KommanderIf setText errorlabel ""
@@ -432,7 +408,6 @@ else
    dcop @dcopid KommanderIf setChecked NextBox false
    dcop @dcopid KommanderIf setText errorlabel "&lt;font color=red&gt;@i18n("Error: could not contact repository host (www.openmamba.org, ret=$RET).")&lt;/font&gt;&lt;br&gt;@i18n("Please check your network configuration and press the button below to try again.")"
    dcop @dcopid KommanderIf setVisible checkButton true
-   dcop @dcopid KommanderIf setVisible ConfigureButton true
    dcop @dcopid KommanderIf setVisible label false
 fi
 </string>

mambabase/mambabase.sh

@@ -1,5 +1,5 @@
 # openmamba post installation script
-# Copyright (c) 2007-2010 by Silvan Calarco <silvan.calarco@mambasoft.it>
+# Copyright (c) 2007-2011 by Silvan Calarco <silvan.calarco@mambasoft.it>
 #
 # Released under the terms of the GNU GPLv3 License
 
@@ -50,7 +50,7 @@ DCOPID=$2
 
 echo $"\
 openmamba installation script - version $VERSION
-Copyright (c) 2007-2010 by Silvan Calarco <silvan.calarco@mambasoft.it>
+Copyright (c) 2007-2011 by Silvan Calarco <silvan.calarco@mambasoft.it>
 "
 
 [ "$DCOPID" ] && dcop $DCOPID KommanderIf setChecked NextBox false
@@ -168,7 +168,7 @@ fi
 if [ "$INSTALL_FLASH" = "1" ]; then
    echo $"Installing flash plugin"
    dcop_write $"Installing Flash plugin..." 10
-   konsole-nofork --background-mode -e /usr/bin/openmamba-netsrpms flashplugin
+   /usr/bin/openmamba-netsrpms flashplugin
    echo $"Executing nspluginscan"
    nspluginscan
    rpm -q gnash && {
@@ -180,18 +180,18 @@ fi
 if [ "$INSTALL_CODECS" = "1" ]; then
    echo $"Installing win32 codecs"
    dcop_write $"Installing Win32 codecs..." 10
-   konsole-nofork --background-mode -e /usr/bin/openmamba-netsrpms win32codecs
+   /usr/bin/openmamba-netsrpms win32codecs
 fi
 
 if [ "$INSTALL_MSTTCF" = "1" ]; then
    dcop_write $"Installing MS TrueType core fonts..." 10
-   konsole-nofork --background-mode -e /usr/bin/openmamba-netsrpms msttcorefonts
+   /usr/bin/openmamba-netsrpms msttcorefonts
 fi
 
 if [ "$INSTALL_SKYPE" = "1" ]; then
    rpm -q libqt4 >/dev/null || apt_get_parsed install -y libqt4
    dcop_write $"Installing Skype software..." 10
-   konsole-nofork --background-mode -e /usr/bin/openmamba-netsrpms skype
+   /usr/bin/openmamba-netsrpms skype
 fi
 
 if [ "$INSTALL_JDK" = "1" ]; then

mambabase/po/es.po

@@ -38,10 +38,10 @@ msgstr ""
 
 #: _from_rc.cc:9
 msgid ""
-"Copyright (c) 2007-2010 by Silvan Calarco\n"
+"Copyright (c) 2007-2011 by Silvan Calarco\n"
 "Released under the terms of the GNU GPL v3 license"
 msgstr ""
-"Copyright (c) 2007-2010 by Silvan Calarco\n"
+"Copyright (c) 2007-2011 by Silvan Calarco\n"
 "Expedido según los terminos de la licencia GNU GPL versione 3"
 
 #: _from_rc.cc:10
@@ -240,10 +240,10 @@ msgstr "           operación."
 #: mambabase.sh:49
 msgid ""
 "openmamba installation script - version $VERSION\n"
-"Copyright (c) 2007-2010 by Silvan Calarco <silvan.calarco@mambasoft.it>\n"
+"Copyright (c) 2007-2011 by Silvan Calarco <silvan.calarco@mambasoft.it>\n"
 msgstr ""
 "Script de instalación de openmamba - versión $VERSION\n"
-"Copyright (c) 2007-2010 by Silvan Calarco <silvan.calarco@mambasoft.it>\n"
+"Copyright (c) 2007-2011 by Silvan Calarco <silvan.calarco@mambasoft.it>\n"
 #: mambabase.sh:55
 msgid "Starting installation..."
 msgstr "Inicio de la instalación..."

mambabase/po/it.po

@@ -38,10 +38,10 @@ msgstr ""
 
 #: _from_rc.cc:9
 msgid ""
-"Copyright (c) 2007-2010 by Silvan Calarco\n"
+"Copyright (c) 2007-2011 by Silvan Calarco\n"
 "Released under the terms of the GNU GPL v3 license"
 msgstr ""
-"Copyright (c) 2007-2010 by Silvan Calarco\n"
+"Copyright (c) 2007-2011 by Silvan Calarco\n"
 "Rilasciato secondo i termini della licenza GNU GPL versione 3"
 
 #: _from_rc.cc:10

mambawelcome/mambawelcome.sh

@@ -79,7 +79,7 @@ echo $"Configuring users and host" | tee -a $LOG_FILE
    }
 
    # configure user for autologin
-   [ "$INSTALL_USER_AUTOLOGIN" = "1" ] && {
+   if [ "$INSTALL_USER_AUTOLOGIN" = "1" ]; then
       echo $"Info: enabling user autologin" | tee -a $LOG_FILE
       [ -e /opt/kde/share/config/kdm/kdmrc ] && {
          sed -i "s|AutoLoginEnable=.*|AutoLoginEnable=true|" \
@@ -87,11 +87,27 @@ echo $"Configuring users and host" | tee -a $LOG_FILE
          sed -i "s|AutoLoginUser=.*|AutoLoginUser=$INSTALL_USER|" \
             /opt/kde/share/config/kdm/kdmrc      
       }
-   } || {
+      [ -e /etc/lxdm/lxdm.conf ] && {
+         sed -i "s|[#[:space:]]*autologin=.*|autologin=$INSTALL_USER|" \
+            /etc/lxdm/lxdm.conf
+      }
+      [ -e /etc/gdm/custom.conf ] && {
+         sed -i "s|[#[:space:]]*AutomaticLogin=.*|AutomaticLogin=$INSTALL_USER|" \
+            /etc/gdm/custom.conf
+         sed -i "s|AutomaticLoginEnable=.*|AutomaticLoginEnable=true|" \
+            /etc/gdm/custom.conf
+      }
+   else
       [ -e /opt/kde/share/config/kdm/kdmrc ] &&
          sed -i "s|AutoLoginEnable=.*|AutoLoginEnable=false|" \
             /opt/kde/share/config/kdm/kdmrc
-   }
+      [ -e /etc/lxdm/lxdm.conf ] &&
+         sed -i "s|[#[:space:]]*\(autologin.*\)|#\1|" \
+            /etc/lxdm/lxdm.conf
+      [ -e /etc/gdm/custom.conf ] &&
+         sed -i "s|AutomaticLoginEnable=.*|AutomaticLoginEnable=false|" \
+            /etc/gdm/custom.conf
+   fi
 
    # pre-create user homedir (currently just needed to put TODO txt files on
    # desktop)   
@@ -143,7 +159,7 @@ sh -c "echo $INSTALL_ROOT_PASSWORD | passwd --stdin" || {
 }
 
 # update grub device mappings and config
-/usr/sbin/grub-mkdevicemap
+/usr/sbin/grub-mkdevicemap -n
 /usr/sbin/update-grub
 
 # configure suspend (from suspend rpm post script) and recreate mkinitramfs

menu/applications/netinstall/b43-firmware.desktop.in

@@ -8,7 +8,7 @@ Comment[es]=Instala el Broadcom B43 firmware por red
 Comment[fr]=Installation du Broadcom B43 firmware depuis le réseau
 Comment[it]=Installa il firmware Broadcom B43 dalla rete
 Encoding=UTF-8
-Exec=/opt/kde/bin/konsole-nofork --background-mode -e @bindir@/openmamba-netsrpms b43-firmware
+Exec=@bindir@/openmamba-netsrpms b43-firmware
 Icon=network-wireless
 MimeType=
 Path=

menu/applications/netinstall/flashplugin.desktop.in

@@ -8,7 +8,7 @@ Comment[es]=Instala el plugin Flash por red
 Comment[fr]=Installation du plugin Flash depuis le réseau
 Comment[it]=Installa il plugin Flash dalla rete
 Encoding=UTF-8
-Exec=/opt/kde/bin/konsole-nofork --background-mode -e @bindir@/openmamba-netsrpms flashplugin
+Exec=@bindir@/openmamba-netsrpms flashplugin
 Icon=distromenu-flash
 MimeType=
 Path=

menu/applications/netinstall/jre.desktop.pregpl.in

@@ -9,6 +9,6 @@ Comment=Install Java Runtime Environment (JRE) from network
 Comment[es]=Instala el Java Runtime Environment (JRE) por red
 Comment[it]=Installa il Java Runtime Environment (JRE) dalla rete
 Comment[fr]=Installation du Java Runtime Environment (JRE) depuis le réseau
-Exec=/opt/kde/bin/konsole-nofork --background-mode -e @bindir@/openmamba-netsrpms jre
+Exec=@bindir@/openmamba-netsrpms jre
 Icon=distromenu-java
 Categories=X-@distroID@-NetInstall;

menu/applications/netinstall/msttcorefonts.desktop.in

@@ -9,6 +9,6 @@ Comment=Install MS TrueType Core Fonts for the Web
 Comment[es]=Instala las fuentes MS TrueType para el Web
 Comment[it]=Installa i font MS TrueType per il Web
 Comment[fr]=Installation des polices MS TrueType pour le Web
-Exec=/opt/kde/bin/konsole-nofork --background-mode -e @bindir@/openmamba-netsrpms msttcorefonts
+Exec=@bindir@/openmamba-netsrpms msttcorefonts
 Icon=fonts-package
 Categories=X-@distroID@-NetInstall;

menu/applications/netinstall/skype.desktop.in

@@ -8,7 +8,7 @@ Comment[es]=Instala Skype por red
 Comment[fr]=Installation du Skype depuis le réseau
 Comment[it]=Installa Skype dalla rete
 Encoding=UTF-8
-Exec=/opt/kde/bin/konsole-nofork --background-mode -e @bindir@/openmamba-netsrpms skype
+Exec=@bindir@/openmamba-netsrpms skype
 Icon=distromenu-skype
 MimeType=
 Path=

menu/applications/netinstall/win32codecs.desktop.in

@@ -9,6 +9,6 @@ Comment=Install the multimedia win32 codecs
 Comment[es]=Instala y pon al día los Win32 codecs multimediales
 Comment[it]=Installa ed aggiorna i codec multimediali Win32
 Comment[fr]=Installation et mise à jour des codecs multimédias Win32
-Exec=/opt/kde/bin/konsole-nofork --background-mode -e @bindir@/openmamba-netsrpms win32codecs
+Exec=@bindir@/openmamba-netsrpms win32codecs
 Icon=applications-multimedia
 Categories=X-@distroID@-NetInstall;