diff --git a/README.md b/README.md index fb51d2e..f2cf3a2 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ # openmamba-release -Release file and Smart Package Manager configuration for openmamba 2.96.0 . +Release file and Smart Package Manager configuration for openmamba 2.99.0 . diff --git a/openmamba-groups.db b/openmamba-groups.db index 4a322af..a934799 100644 --- a/openmamba-groups.db +++ b/openmamba-groups.db @@ -3,6 +3,7 @@ rpm -q desktop-base-kde4 >/dev/null && KDE4_IS_INSTALLED=1 rpm -q desktop-base-gnome >/dev/null && GNOME_IS_INSTALLED=1 +ARCH=`uname -m` PKG_GROUPS=("KERNEL_MAMBA_PKGS" "KERNEL_MAMBA_64GB_PKGS" "BASE_PKGS" "OFFICE_PKGS" "OFFICE_EXTRA_PKGS" "MULTIMEDIA_PLAYERS_PKGS" "MULTIMEDIA_EDITING_PKGS" "INTERNET_PKGS" "INTERNET_EXTRA_PKGS" "GRAPHICS_PKGS" "SCIENTIFIC_PKGS" "GAMES_PKGS" @@ -37,11 +38,15 @@ kernel-mamba-arm kernel-mamba-arm-sound kernel-mamba-arm-wireless" BASE_PKGS="\ desktop-base-openmamba logrotate vixie-cron openssh-server \ -samba-server unrar foomatic nfs-utils lsb \ -pcmcia-utils mambatray gdb r5u87x-firmware zd1211-firmware \ +samba-server foomatic nfs-utils lsb \ +mambatray r5u87x-firmware zd1211-firmware \ alsa-firmware alsa-tools-firmware midisport-firmware \ bluez-firmware ipw2100-firmware ipw2200-firmware xterm desktop-file-utils \ -chinese-fonts-ttf un-core-fonts-ttf inetutils VirtualBox-vboxguest" +chinese-fonts-ttf un-core-fonts-ttf inetutils" + +if [ "$ARCH" != "arm" ]; then + BASE_PKGS="$BASE_PKGS unrar VirtualBox-vboxguest pcmcia-utils" +fi if [ "$KDE4_IS_INSTALLED" ]; then BASE_PKGS="$BASE_PKGS ksnapshot okular kamera \ diff --git a/openmamba-release.spec b/openmamba-release.spec index efab18e..be8fc3b 100644 --- a/openmamba-release.spec +++ b/openmamba-release.spec @@ -1,6 +1,4 @@ ### AUTOUPDATE-OFF: 0 1 -%define branch devel -#% define branch stable %define distroid openmamba %define fullversion %{version} @@ -8,17 +6,19 @@ %define devel_reps devel devel-games devel-kde4 devel-kernel devel-xorg devel-makedist devel-embedded devel-autodist devel-future devel-java %define devel_default_reps devel devel-games -%if %branch == stable - %define milestone milestone3 - %define codename %{milestone}-build1 +%if "%?_distrib_milestone" != "devel" + %define branch stable + %define milestone %_distrib_milestone + %define codename %{milestone} %else + %define branch devel %define milestone devel %define codename rolling %endif Name: openmamba-release -Version: 2.96.0 -Release: 2mamba +Version: 2.99.0 +Release: 1mamba Summary: Release file and Smart Package Manager configuration for %{distroid} %{fullversion} %{?codename:(%codename)} Group: System/Configuration Vendor: openmamba @@ -200,6 +200,10 @@ fi %{_sysconfdir}/smart/distro.d/90-%{distroid}-devel-repositories.py %changelog +* Fri Dec 26 2014 Silvan Calarco 2.99.0-1mamba +- update to 2.99.0 +- groups.db: arm: fix BASE_PKGS + * Sat Sep 13 2014 Silvan Calarco 2.96.0-2mamba - openmamba-smart-devel.py: disable milestone3 repositories