From 260c36239ba066a7b7a2fd8704d6e9591f409fcf Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Sat, 15 Nov 2014 09:57:37 +1300 Subject: [PATCH] Remove automated rpm and arch packaging. See #6480 for the reasoning. --- .travis.yml | 9 +--- packaging/linux/buildpackage.sh | 17 -------- packaging/linux/pkgbuild/PKGBUILD | 26 ------------ packaging/linux/pkgbuild/buildpackage.sh | 22 ---------- packaging/linux/rpm/buildpackage.sh | 29 ------------- packaging/linux/rpm/openra.spec | 54 ------------------------ 6 files changed, 1 insertion(+), 156 deletions(-) delete mode 100644 packaging/linux/pkgbuild/PKGBUILD delete mode 100755 packaging/linux/pkgbuild/buildpackage.sh delete mode 100755 packaging/linux/rpm/buildpackage.sh delete mode 100644 packaging/linux/rpm/openra.spec diff --git a/.travis.yml b/.travis.yml index bc4b4b8f04..77c39d2351 100644 --- a/.travis.yml +++ b/.travis.yml @@ -43,12 +43,7 @@ notifications: skip_join: true before_deploy: - - sudo apt-get install nsis markdown dpkg rpm libarchive-dev m4 fakeroot bsdtar - - wget ftp://ftp.archlinux.org/other/pacman/pacman-4.0.3.tar.gz -O /tmp/pacman-4.0.3.tar.gz - - pushd /tmp - - tar -xzvf pacman-4.0.3.tar.gz - - cd pacman-4.0.3 && ./configure --disable-doc --prefix=/usr && make && sudo make install - - popd + - sudo apt-get install nsis markdown dpkg - DOTVERSION=`echo ${TRAVIS_TAG} | sed "s/-/\\./g"` - cd packaging - mkdir build @@ -61,8 +56,6 @@ deploy: - build/OpenRA-${TRAVIS_TAG}.exe - build/OpenRA-${TRAVIS_TAG}.zip - build/openra_${DOTVERSION}_all.deb - - build/openra-${DOTVERSION}-1-any.pkg.tar.gz - - build/openra-${DOTVERSION}-1.noarch.rpm skip_cleanup: true on: all_branches: true diff --git a/packaging/linux/buildpackage.sh b/packaging/linux/buildpackage.sh index 32dea3f898..e4960ad290 100755 --- a/packaging/linux/buildpackage.sh +++ b/packaging/linux/buildpackage.sh @@ -39,20 +39,3 @@ if [ $? -ne 0 ]; then echo "Debian package build failed." fi popd - -pushd pkgbuild -echo "Building Arch-Linux package." -bash buildpackage.sh "$TAG" ../$ROOTDIR "$PACKAGEDIR" -if [ $? -ne 0 ]; then - echo "Arch-Linux package build failed." -fi -popd - -pushd rpm -echo "Building RPM package." -bash buildpackage.sh "$TAG" ../$ROOTDIR ~/rpmbuild "$PACKAGEDIR" -if [ $? -ne 0 ]; then - echo "RPM package build failed." -fi -popd - diff --git a/packaging/linux/pkgbuild/PKGBUILD b/packaging/linux/pkgbuild/PKGBUILD deleted file mode 100644 index dee32b3df8..0000000000 --- a/packaging/linux/pkgbuild/PKGBUILD +++ /dev/null @@ -1,26 +0,0 @@ -# Contributor: Matthew Bowra-Dean -pkgname=openra -pkgver={VERSION} -pkgrel=1 -pkgdesc="Open Source rebuild of the Red Alert game engine using Mono/OpenGL." -arch=('any') -url="http://openra.net" -license=('GPL3') -groups=() -depends=('mono' 'openal' 'mesa' 'freetype2' 'glibc' 'alsa-lib' 'xdg-utils' 'zenity') -makedepends=('git' 'unzip' 'wget') -optdepends=('gksu: Elevation for installing game packages on Gnome platforms' -'kdesudo: Elevation for installing game packages on KDE platforms') -provides=() -conflicts=() -replaces=() -backup=() -options=() -source=() -noextract=() -md5sums=() - -build() { - cp -r {ROOT}/usr/ $pkgdir/ -} - diff --git a/packaging/linux/pkgbuild/buildpackage.sh b/packaging/linux/pkgbuild/buildpackage.sh deleted file mode 100755 index d7ef8f92c8..0000000000 --- a/packaging/linux/pkgbuild/buildpackage.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash -E_BADARGS=85 -if [ $# -ne "3" ] -then - echo "Usage: `basename $0` version root-dir outputdir" - exit $E_BADARGS -fi - -# Replace any dashes in the version string with periods -PKGVERSION=`echo $1 | sed "s/-/\\./g"` - -sed -i "s/{VERSION}/$PKGVERSION/" PKGBUILD -rootdir=`readlink -f $2` -sed -i "s|{ROOT}|$rootdir|" PKGBUILD - -makepkg --holdver --nodeps -p PKGBUILD -if [ $? -ne 0 ]; then - exit 1 -fi - -mv openra-$PKGVERSION-1-any.pkg.tar.gz $3 - diff --git a/packaging/linux/rpm/buildpackage.sh b/packaging/linux/rpm/buildpackage.sh deleted file mode 100755 index d678b24a12..0000000000 --- a/packaging/linux/rpm/buildpackage.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash -E_BADARGS=85 -if [ $# -ne "4" ] -then - echo "Usage: `basename $0` version root-dir packaging-dir outputdir" - exit $E_BADARGS -fi - -mkdir ~/rpmbuild/ -mkdir ~/rpmbuild/SPECS - -# Replace any dashes in the version string with periods -PKGVERSION=`echo $1 | sed "s/-/\\./g"` - -sed -i "s/{VERSION_FIELD}/$PKGVERSION/" openra.spec -rootdir=`readlink -f $2` -sed -i "s|{ROOT_DIR}|$rootdir|" openra.spec - -cp openra.spec "$3/SPECS/" - -cd "$3" - -rpmbuild --target noarch --buildroot /tmp/openra/ -bb SPECS/openra.spec -if [ $? -ne 0 ]; then - exit 1 -fi - -cd RPMS/noarch/ -mv openra-$PKGVERSION-1.noarch.rpm $4 diff --git a/packaging/linux/rpm/openra.spec b/packaging/linux/rpm/openra.spec deleted file mode 100644 index d7ad7261f7..0000000000 --- a/packaging/linux/rpm/openra.spec +++ /dev/null @@ -1,54 +0,0 @@ -%define name openra -%define version {VERSION_FIELD} -%define root {ROOT_DIR} -%define _use_internal_dependency_generator 0 -%define __find_provides "" -%define __find_requires "" -Name: %{name} -Version: %{version} -Release: 1 -Summary: Open Source rebuild of the Red Alert game engine using Mono/OpenGL. -License: GPL-3.0 -Url: http://openra.net -Group: Amusements/Games -Packager: Matthias Mailänder -Requires: mono-core -Requires: mono-winforms -Requires: openal -Requires: libfreetype.so.6 -Requires: libasound.so.2 -Requires: libc.so.6 -Requires: libdl.so.2 -Requires: libm.so.6 -Requires: libpthread.so.0 -Requires: librt.so.1 -Requires: xdg-utils -Requires: zenity - -Prefix: /usr -Source: %{name}-%{version}.tar.gz -BuildRoot: /tmp/openra - -%description -A reimplementation of the Command & Conquer: Red Alert game engine -using .NET/Mono, OpenGL, OpenAL and SDL. It includes reimagninations -of Command & Conquer: Red Alert, Command & Conquer: Tiberian Dawn -as well as Dune 2000. - -%build - -%install -rm -rf %{buildroot} -cp -r %{root} %{buildroot} - -%clean -rm -rf %{buildroot} - -%files -/usr/bin/openra -/usr/bin/openra-editor -/usr/lib/openra/ -/usr/share/applications/*.desktop -/usr/share/doc/openra/* -/usr/share/icons/hicolor/*/apps/*.png -/usr/share/icons/hicolor/*/apps/*.svg