From 091b8290ba6fba50713a47bad66b738207d4799f Mon Sep 17 00:00:00 2001 From: Silvan Calarco Date: Wed, 10 Apr 2013 19:30:33 +0200 Subject: [PATCH] flashplugin: update to 11.2.202.280 sun-java7: update to 7u17 (x86*) and 7u10 (arm) --- Makefile | 19 +++++++++++++------ SRPMS/sun-java7/sun-java7.spec.in | 16 ++++++++++------ SRPMSVERSIONS | 4 ++-- 3 files changed, 25 insertions(+), 14 deletions(-) diff --git a/Makefile b/Makefile index 1e7297c..8ae03fc 100644 --- a/Makefile +++ b/Makefile @@ -1,9 +1,17 @@ -# Makefile for openmamba-desktop-base -# Copyright (C) 2004-2011 by Silvan Calarco +# Makefile for desktop-base-openmamba package +# Copyright (C) 2004-2013 by Silvan Calarco # Copyright (C) 2005-2007 by Davide Madrisan include VERSION -include SRPMSVERSIONS + +ARCH:=`uname -i` + +ifeq ($(ARCH), arm) +SRPMSVERSIONSFILE = SRPMSVERSIONS.arm +else +SRPMSVERSIONSFILE = SRPMSVERSIONS +endif +include $(SRPMSVERSIONSFILE) PACKAGE = desktop-base-openmamba DISTROID = openmamba @@ -27,7 +35,6 @@ SCREENSAVER = DISTROid = $(shell echo $(DISTROID) | tr A-Z a-z) DISTROICON = $(DISTROid) -ARCH=`uname -i` DESTDIR = @@ -97,7 +104,7 @@ pck_catalogs2 := $(wildcard bootrecover/po/*.po) .SUFFIXES: .in .po .mo .in:; @echo "generating $@..."; \ - if [ "$(ARCH)" != "x86_64" ]; then ARCH=i386; else ARCH=$(ARCH); fi; \ + if [ "$(ARCH)" != "x86_64" -a "$(ARCH)" != "arm" ]; then ARCH=i386; else ARCH=$(ARCH); fi; \ sed "s,@distroID@,$(DISTROID),g;\ s,@distroid@,$(DISTROid),g;\ s,@distroicon@,$(DISTROICON),g;\ @@ -201,7 +208,7 @@ install-distromenu: dist-update install-srpms: @$(INSTALL_DIR) $(DESTDIR)$(distrosrpmsdir) @$(INSTALL_DIR) $(DESTDIR)$(sysconfigdir) - @cat SRPMSVERSIONS > $(DESTDIR)$(sysconfigdir)/$(SYSCONFIGFILE) + @cat $(SRPMSVERSIONSFILE) > $(DESTDIR)$(sysconfigdir)/$(SYSCONFIGFILE) for pck in $(pck_srpms); do\ rpmbuild -bs SRPMS/$$pck/$${pck}.spec \ --define="_sourcedir `pwd`/SRPMS/$$pck" \ diff --git a/SRPMS/sun-java7/sun-java7.spec.in b/SRPMS/sun-java7/sun-java7.spec.in index bd636dc..c00233b 100644 --- a/SRPMS/sun-java7/sun-java7.spec.in +++ b/SRPMS/sun-java7/sun-java7.spec.in @@ -8,7 +8,7 @@ %define javaver %{major}.%{minor} %define jppname java-%{javaver}-%{origin} %define javaws_ver %{javaver} -%define toplevel_dir jdk%{javaver}_06 +%define toplevel_dir jdk%{javaver}_%{MINOR} %define distversion %{version} %define label -%{name} %define jdklnk jdk7-%{origin} @@ -23,7 +23,7 @@ Name: sun-java7 Version: @sunjava7ver@ -Release: 2@distroext@ +Release: 1@distroext@ Epoch: 1 Summary: Sun Java Developer's Kit Group: System/Libraries/Java @@ -53,7 +53,7 @@ Sun Java Developer's Kit. %package runtime Summary: Sun Java Platform Runtime Environment Group: System/Libraries/Java -Obsoletes: j2re +#Obsoletes: j2re Provides: j2re = %{version} Provides: jre = %{version} @@ -69,19 +69,19 @@ Sun Java Platform Runtime Environment. %ifarch %{ix86} wget -nv --tries=2 --no-cookies --header \ "Cookie: gpw_e24=http%3A%2F%2Fwww.oracle.com%2Ftechnetwork%2Fjava%2Fjavase%2Fdownloads%2Fjdk-%{version}-download-1501626.html;" \ - http://download.oracle.com/otn-pub/java/jdk/%{version}-b24/jdk-%{version}-linux-i586.tar.gz + http://download.oracle.com/otn-pub/java/jdk/%{version}-b02/jdk-%{version}-linux-i586.tar.gz tar xf jdk-%{version}-linux-i586.tar.gz %endif %ifarch x86_64 wget -nv --tries=2 --no-cookies --header \ "Cookie: gpw_e24=http%3A%2F%2Fwww.oracle.com%2Ftechnetwork%2Fjava%2Fjavase%2Fdownloads%2Fjdk-%{version}-download-1501626.html;" \ - http://download.oracle.com/otn-pub/java/jdk/%{version}-b24/jdk-%{version}-linux-x64.tar.gz + http://download.oracle.com/otn-pub/java/jdk/%{version}-b02/jdk-%{version}-linux-x64.tar.gz tar xf jdk-%{version}-linux-x64.tar.gz %endif %ifarch arm wget -nv --tries=2 --no-cookies --header \ "Cookie: gpw_e24=http%3A%2F%2Fwww.oracle.com%2Ftechnetwork%2Fjava%2Fjavase%2Fdownloads%2Fjdk-%{version}-download-1501626.html;" \ - http://download.oracle.com/otn-pub/java/jdk/%{version}-b24/jdk-%{version}-linux-arm-sfp.tar.gz + http://download.oracle.com/otn-pub/java/jdk/%{version}-b18/jdk-%{version}-linux-arm-sfp.tar.gz tar xf jdk-%{version}-linux-arm-sfp.tar.gz %endif @@ -527,6 +527,7 @@ fi %config(noreplace) %{_jvmdir}/%{jredir}/lib/security/java.policy %config(noreplace) %{_jvmdir}/%{jredir}/lib/security/java.security %ifnarch arm +%config(noreplace) %{_jvmdir}/%{jredir}/lib/security/javafx.policy %config(noreplace) %{_jvmdir}/%{jredir}/lib/security/javaws.policy %endif %config(noreplace) %{_jvmdir}/%{jredir}/lib/security/blacklist @@ -593,6 +594,9 @@ fi # %{toplevel_dir}/jre/README %{toplevel_dir}/jre/Welcome.html %changelog +* Wed Apr 10 2013 Silvan Calarco 7u17-1mamba +- update to 7u17 + * Sun Aug 19 2012 Silvan Calarco 7u6-2mamba - rename to sun-java7 diff --git a/SRPMSVERSIONS b/SRPMSVERSIONS index ed226f1..ea264a2 100644 --- a/SRPMSVERSIONS +++ b/SRPMSVERSIONS @@ -1,5 +1,5 @@ -FLASHPLUGIN_VERSION=11.2.202.275 +FLASHPLUGIN_VERSION=11.2.202.280 WIN32CODECS_VERSION=20110131 SKYPE_VERSION=4.1.0.20 VIRTUALBOX_EXTENSION_PACK_VERSION=4.2.0 -SUN_JAVA7_VERSION=7u6 +SUN_JAVA7_VERSION=7u17