Release 3.0.4

openmamba-netsrpms: only run curl to check version for specified component, not all
Release 3.0.3
2016-02-12 11:30:02 +01:00 · 2016-02-12 11:27:22 +01:00 · 2016-02-12 11:17:33 +01:00 · 2016-02-12 11:13:38 +01:00 · 2016-02-12 11:01:35 +01:00 · 2016-02-12 11:00:02 +01:00
13 changed files with 45 additions and 13 deletions
--- a/SRPMS/b43-firmware/b43-firmware.spec.in
+++ b/SRPMS/b43-firmware/b43-firmware.spec.in
@@ -64,6 +64,8 @@ rm -fr ${tmpdir}

 %clean
 [ "%{buildroot}" != / ] && rm -rf %{buildroot}
+rm -rf %{_builddir}/%{name}-*
+:

 %files
 %defattr(-,root,root)
--- a/SRPMS/chromium-pepper-flash/chromium-pepper-flash.spec.in
+++ b/SRPMS/chromium-pepper-flash/chromium-pepper-flash.spec.in
@@ -52,6 +52,8 @@ rm -fr ${tmpdir}

 %clean
 [ "%{buildroot}" != / ] && rm -rf %{buildroot}
+rm -rf %{_builddir}/%{name}-*
+:

 %files
 %defattr(-,root,root)
--- a/SRPMS/flashplugin/flashplugin.spec.in
+++ b/SRPMS/flashplugin/flashplugin.spec.in
@@ -59,6 +59,8 @@ rm -fr ${tmpdir}

 %clean
 [ "%{buildroot}" != / ] && rm -rf %{buildroot}
+rm -rf %{_builddir}/%{name}-*
+:

 %files
 %defattr(-,root,root)
--- a/SRPMS/msttcorefonts/msttcorefonts.spec.in
+++ b/SRPMS/msttcorefonts/msttcorefonts.spec.in
@@ -33,6 +33,8 @@ BuildRoot:     %{_tmppath}/%{name}-%{version}-root
 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.

 %prep
+%setup -c -n %{name}-%{version} -D -T
+
 rm -rf %{name}
 mkdir %{name}
 cd %{name}
@@ -83,6 +85,8 @@ cp *.ttf %{buildroot}%{fontdir}

 %clean
 [ "%{buildroot}" != / ] && rm -rf %{buildroot}
+rm -rf %{_builddir}/%{name}-*
+:

 %post
 /usr/bin/fc-cache
--- a/SRPMS/skype/skype.spec.in
+++ b/SRPMS/skype/skype.spec.in
@@ -14,6 +14,7 @@ BuildPrereq:   wget
 BuildPrereq:   /usr/bin/tempfile
 # NOTE: requires the backward compatible version of the libstdc++ library
 Requires:      pulseaudio
+Requires:      libv4l.i586
 BuildRoot:     %{_tmppath}/%{name}-%{version}-root

 %description
@@ -98,6 +99,8 @@ _EOF

 %clean
 [ "%{buildroot}" != / ] && rm -rf %{buildroot}
+rm -rf %{_builddir}/%{name}-*
+:

 %files
 %defattr(-,root,root)
--- a/SRPMS/spotify/spotify.spec.in
+++ b/SRPMS/spotify/spotify.spec.in
@@ -50,6 +50,8 @@ ln -sf /usr/lib64/libssl.so.1.0.0 %{buildroot}/opt/spotify/lib/spotify-client/li

 %clean
 [ "%{buildroot}" != / ] && rm -rf "%{buildroot}"
+rm -rf %{_builddir}/%{name}-*
+:

 %pre
 if [ $1 -ge 1 ]; then
--- a/SRPMS/sun-java7/sun-java7.spec.in
+++ b/SRPMS/sun-java7/sun-java7.spec.in
@@ -308,6 +308,8 @@ rm -f %{buildroot}%{_jvmdir}/%{jredir}/lib/*/fxavcodecplugin-52.so

 %clean
 [ "%{buildroot}" != / ] && rm -rf %{buildroot}
+rm -rf %{_builddir}/%{name}-*
+:

 %pre
 if [ $1 -ge 1 ]; then
--- a/SRPMS/virtualbox-extension-pack/virtualbox-extension-pack.spec.in
+++ b/SRPMS/virtualbox-extension-pack/virtualbox-extension-pack.spec.in
@@ -45,6 +45,8 @@ cp %{S:0} LICENSE

 %clean
 [ "%{buildroot}" != / ] && rm -rf %{buildroot}
+rm -rf %{_builddir}/%{name}-*
+:

 %post
 #VBoxManage extpack uninstall Oracle_VM_VirtualBox_Extension_Pack || true
--- a/SRPMS/win32codecs/win32codecs.spec.in
+++ b/SRPMS/win32codecs/win32codecs.spec.in
@@ -92,6 +92,8 @@ find . -type f -exec install -D "{}" "%{buildroot}%{win32dir}/{}" \;

 %clean
 [ "%{buildroot}" != / ] && rm -rf %{buildroot}
+rm -rf %{_builddir}/%{name}-*
+:

 %files
 %defattr(-,root,root)
--- a/18
+++ b/18
@@ -2,14 +2,18 @@
 SRPMVERSION["b43-firmware"]=4.150.10.5
 SRPMRELEASE["b43-firmware"]=1mamba
 # flashplugin
-SRPMVERSION["flashplugin"]="`curl -s http://www.adobe.com/software/flash/about/ | grep -A2 "Linux" | tail -n1 | sed -e 's/[[:space:]]*<[^>][^>]*>//g;s/[[:space:]]//' 2>/dev/null`"
+if [ ! "$SRPMCHECK" -o "$SRPMCHECK" = "flashplugin" ]; then
+  SRPMVERSION["flashplugin"]="`curl --max-time 20 -s http://www.adobe.com/software/flash/about/ | grep -A2 "Linux" | tail -n1 | sed -e 's/[[:space:]]*<[^>][^>]*>//g;s/[[:space:]]//' 2>/dev/null`"
  SRPMRELEASE["flashplugin"]=1mamba
+fi
 # msttcorefonts
 SRPMVERSION["msttcorefonts"]=1.3
 SRPMRELEASE["msttcorefonts"]=7mamba
 # skype
-SRPMVERSION["skype"]="`curl -sLI "http://www.skype.com/go/getskype-linux-beta-dynamic"|grep "linux/skype-"|sed "s|.*skype-\(.*\)\.tar\..*|\1|" 2>/dev/null`"
+if [ ! "$SRPMCHECK" -o "$SRPMCHECK" = "skype" ]; then
+  SRPMVERSION["skype"]="`curl --max-time 20 -sLI "http://www.skype.com/go/getskype-linux-beta-dynamic"|grep "linux/skype-"|sed "s|.*skype-\(.*\)\.tar\..*|\1|"|grep -v "\.\.0\." 2>/dev/null`"
  SRPMRELEASE["skype"]=2mamba
+fi
 # spotify
 if [ "`uname -m`" == "x86_64" ]; then
 SRPMVERSION["spotify"]=20150629
@@ -18,14 +22,20 @@ SRPMVERSION["spotify"]=0
 fi
 SRPMRELEASE["spotify"]=1mamba
 # sun-java7
-SRPMVERSION["sun-java7"]="`curl -s http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html|grep "Linux x86.*i586.tar.gz"|tail -n1|sed "s|.*/java/jdk/\(.*\)/jdk-.*|\1|;s|-|_|" 2>/dev/null`"
+if [ ! "$SRPMCHECK" -o "$SRPMCHECK" = "sun-java7" ]; then
+  SRPMVERSION["sun-java7"]="`curl --max-time 20 -s http://www.oracle.com/technetwork/java/javase/downloads/jdk7-downloads-1880260.html|grep "Linux x86.*i586.tar.gz"|tail -n1|sed "s|.*/java/jdk/\(.*\)/jdk-.*|\1|;s|-|_|" 2>/dev/null`"
  SRPMRELEASE["sun-java7"]=1mamba
+fi
 # virtualbox-extension-pack
+if [ ! "$SRPMCHECK" -o "$SRPMCHECK" = "virtualbox-extension-pack" ]; then
  SRPMVERSION["virtualbox-extension-pack"]="`rpm -q VirtualBox 2>/dev/null| cut -d- -f2`"
  SRPMRELEASE["virtualbox-extension-pack"]=1mamba
+fi
 # win32codecs
 SRPMVERSION["win32codecs"]=20110131
 SRPMRELEASE["win32codecs"]=1mamba
 # chromium-pepper-flash
-SRPMVERSION["chromium-pepper-flash"]="`curl -s "http://googlechromereleases.blogspot.it/" | grep -i -m 1 "stable channel has been updated to" | sed "s|.*updated to \([0-9.]*\) .*|\1|" 2>/dev/null`"
+if [ ! "$SRPMCHECK" -o "$SRPMCHECK" = "chromium-pepper-flash" ]; then
+  SRPMVERSION["chromium-pepper-flash"]="`curl --max-time 20 -s "http://googlechromereleases.blogspot.it/" | grep -i -m 1 "stable channel has been updated to" | sed "s|.*updated to \([0-9.]*\) .*|\1|" 2>/dev/null`"
  SRPMRELEASE["chromium-pepper-flash"]=1mamba
+fi
--- a/SRPMSVERSIONS.arm
+++ b/SRPMSVERSIONS.arm
@@ -1,2 +1,2 @@
-SRPMVERSION["sun-java7"]="`curl -s http://www.oracle.com/technetwork/java/javase/downloads/jdk7-arm-downloads-2187468.html|grep "Linux ARM.*arm-vfp-sflt.tar.gz"|tail -n1|sed "s|.*/java/jdk/\(.*\)/jdk-.*|\1|;s|-|_|" 2>/dev/null`"
+SRPMVERSION["sun-java7"]="`curl --max-time 20 -s http://www.oracle.com/technetwork/java/javase/downloads/jdk7-arm-downloads-2187468.html|grep "Linux ARM.*arm-vfp-sflt.tar.gz"|tail -n1|sed "s|.*/java/jdk/\(.*\)/jdk-.*|\1|;s|-|_|" 2>/dev/null`"
 SRPMRELEASE["sun-java7"]=1mamba
--- a/2
+++ b/2
@@ -1 +1 @@
-VERSION = 3.0.2
+VERSION = 3.0.4
--- a/openmamba-update/openmamba-netsrpms
+++ b/openmamba-update/openmamba-netsrpms
@@ -44,9 +44,10 @@ function check_if_already_installed() {
 }

 declare -A SRPMVERSION SRPMRELEASE
-. /etc/sysconfig/netsrpminstall || exit 1

 for pckname in $PACKAGES; do
+   export SRPMCHECK="$pckname"
+   . /etc/sysconfig/netsrpminstall || exit 1

   SRPM_PATH=$DISTRO_SRPMS_DIR/${pckname}
   SPEC_PATHNAME=$SRPM_PATH/${pckname}.spec
Author	SHA1	Message	Date
Silvan Calarco	94d9fb5882	Release 3.0.4	2016-02-12 11:30:02 +01:00
Silvan Calarco	d4479c117c	openmamba-netsrpms: only run curl to check version for specified component, not all	2016-02-12 11:27:22 +01:00
Silvan Calarco	fcb13665a0	Release 3.0.3	2016-02-12 11:17:33 +01:00
Silvan Calarco	2df4b31c4b	SRPMSVERSION: add --max-time also to other curl invocations	2016-02-12 11:13:38 +01:00
Silvan Calarco	48755a089f	SRPMS: clean builddir for each package (including previous versions)	2016-02-12 11:01:35 +01:00
Silvan Calarco	8463b462e2	SRPMVERSION: fix for skype version retrieving and add curl timeout when fetching adobe version	2016-02-12 11:00:02 +01:00
Silvan Calarco	1aa1b2d379	skype: require libv4l.i586	2015-10-20 20:09:59 +02:00