Correct the EDI license in packaging - GPLv2.

Also removed packaging from skeleton as it gets out of date too fast
edi-0.8
Andy Williams 6 years ago
parent 0154ee168a
commit 529d40bf69
  1. 2
      data/extra/skeleton/eflproject/Makefile.am
  2. 3
      data/extra/skeleton/eflproject/configure.ac
  3. 4
      data/extra/skeleton/eflproject/packaging/Makefile.am
  4. 3
      data/extra/skeleton/eflproject/packaging/pkgbuild/Makefile.am
  5. 60
      data/extra/skeleton/eflproject/packaging/pkgbuild/PKGBUILD
  6. 106
      data/extra/skeleton/eflproject/packaging/slackware/${edi_name}.SlackBuild
  7. 4
      data/extra/skeleton/eflproject/packaging/slackware/Makefile.am
  8. 1
      data/extra/skeleton/eflproject/packaging/slackware/doinst.sh
  9. 19
      data/extra/skeleton/eflproject/packaging/slackware/slack-desc
  10. 5
      data/extra/skeleton/eflproject/packaging/slackware/slack-required
  11. 2
      packaging/pkgbuild/PKGBUILD

@ -29,7 +29,7 @@ MAINTAINERCLEANFILES = \
$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.gz \
$(PACKAGE_TARNAME)-$(PACKAGE_VERSION).tar.bz2
SUBDIRS = data doc packaging po src
SUBDIRS = data doc po src
ACLOCAL_AMFLAGS = -I m4

@ -67,9 +67,6 @@ data/desktop/${edi_name}.desktop
data/themes/Makefile
data/themes/default/Makefile
doc/Makefile
packaging/Makefile
packaging/slackware/Makefile
packaging/pkgbuild/Makefile
po/Makefile.in
src/Makefile
src/bin/Makefile

@ -1,4 +0,0 @@
MAINTAINERCLEANFILES = Makefile.in
SUBDIRS = slackware pkgbuild

@ -1,3 +0,0 @@
MAINTAINERCLEANFILES = Makefile.in
EXTRA_DIST = PKGBUILD

@ -1,60 +0,0 @@
# Maintainer: Enlightenment Developers <enlightenment-devel@enlightenment.org>
pkgname=('${edi_name}-git' '${edi_name}_doc-git')
pkgver=1.8.99.8967.a1cfce6
pkgrel=1
pkgdesc="Enlightenment toolkit ${edi_name} - GIT development snapshot"
arch=('i686' 'x86_64' 'arm')
url="http://${Edi_Url}"
license=('WTFPL')
makedepends=('doxygen' 'imagemagick' 'git')
depends=('elementary-git')
optdepends=('emotion_generic_players' 'evas_generic_loaders')
options=('!libtool' 'debug')
provides=('${edi_name}')
pkgver() {
cd "../.."
for _i in v_maj v_min v_mic; do
local v_ver=$v_ver.$(grep -m 1 $_i configure.ac | sed 's/m4//' | grep -o "[[:digit:]]*")
done
v_ver=$(awk -F , -v v_ver=${v_ver#.} '/^AC_INIT/ {gsub(/v_ver/, v_ver); gsub(/[\[\] -]/, ""); print $2}' configure.ac)
printf "$v_ver.$(git rev-list --count HEAD).$(git rev-parse --short HEAD)"
}
build() {
cd "../.."
export CFLAGS="$CFLAGS -fvisibility=hidden -fomit-frame-pointer"
[[ -e Makefile ]] && make clean distclean
./configure --prefix=/usr \
--disable-static
make
make doc
}
package_${edi_name}-git() {
cd "../.."
make -j1 DESTDIR="$pkgdir/" install
install -Dm644 README "$pkgdir/usr/share/$pkgname/README"
install -Dm644 NEWS "$pkgdir/usr/share/$pkgname/NEWS"
install -Dm644 ChangeLog "$pkgdir/usr/share/$pkgname/ChangeLog"
install -Dm644 AUTHORS "$pkgdir/usr/share/$pkgname/AUTHORS"
install -Dm644 COMPLIANCE "$pkgdir/usr/share/$pkgname/COMPLIANCE"
install -Dm644 COPYING.images "$pkgdir/usr/share/licenses/$pkgname/COPYING.images"
sed -n '1,/details./p' COPYING > "$pkgdir/usr/share/licenses/$pkgname/COPYING"
ln -s "../licenses/$pkgname/COPYING" "$pkgdir/usr/share/$pkgname/COPYING"
ln -s "../licenses/$pkgname/COPYING.images" "$pkgdir/usr/share/$pkgname/COPYING.images"
}
package_${edi_name}_doc-git() {
pkgdesc="Documentation for ${Edi_Name}"
arch=('any')
unset depends optdepends
cd "../.."
mkdir -p "$pkgdir/usr/share/doc/$pkgname"
cp -a doc/html "$pkgdir/usr/share/doc/$pkgname/html"
cp -a doc/latex "$pkgdir/usr/share/doc/$pkgname/latex"
}

@ -1,106 +0,0 @@
#!/bin/bash
#
# Begin ${edi_name}.SlackBuild
#
# Copyright (C) 2012-2013 Jerome Pinot <ngc891@gmail.com>
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
# permitted provided that the following conditions are met:
#
# 1. Redistributions of this script must retain the above copyright
# notice, this list of conditions and the following disclaimer.
#
# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
# EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
NAME=${edi_name}
BUILD=${BUILD:-1jp}
CWD=$(pwd)
TMP=${TMP:-/tmp}
PKG=${TMP}/package-${NAME}
# First check if we are in the right folder
if [ -f ./${NAME}.SlackBuild ]; then
echo 'Found SlackBuild'
else
echo 'Error: You must run this script from the packaging/slackware sub-folder!'
exit 1
fi
# Get the version number from configure.ac
if [ -f ../../configure.ac ];then
VERSION=`grep "AC_INIT" ../../configure.ac | cut -d' ' -f2 | sed -e 's/\[//' -e 's/\],//'`
else
echo "Error: can't find configure.ac!"
exit 2
fi
# if ${ARCH} is unset, we have to guess it with uname
if [ -z "${ARCH}" ]; then
case "$(uname -m)" in
i?86) export ARCH=i486 ;;
arm*) export ARCH=arm ;;
*) export ARCH=$(uname -m) ;;
esac
fi
# Set generic flags for gcc
SCFLAGS='-O2'
if [ "${ARCH}" = "i486" ]; then
SCFLAGS="${SCFLAGS} -march=i486 -mtune=i686"
LIBDIR="/usr/lib"
elif [ "${ARCH}" = "x86_64" ]; then
SCFLAGS="${SCFLAGS} -fPIC"
LIBDIR="/usr/lib64"
elif [ "${ARCH}" = "arm" ]; then
SCFLAGS="${SCFLAGS} -march=armv4 -mtune=xscale"
LIBDIR="/usr/lib"
fi
# Creating directories
if [ ! -d ${TMP} ]; then
mkdir -p ${TMP}
fi
rm -rf ${PKG}
mkdir -p ${PKG}
# Configuring
cd ../..
CFLAGS="${SCFLAGS}" \
./configure \
--prefix=/usr \
--libdir=${LIBDIR} \
--mandir=/usr/man \
--docdir=/usr/doc/${NAME}-${VERSION}
# Building
make
# Installing
make DESTDIR=${PKG} install
# Cleaning
cd ${PKG}
gzip -9 usr/man/man1/${NAME}.1
find ${PKG} | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
find ${PKG} | xargs file | grep "shared object" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
# Building the package
mkdir install
install -m644 ${CWD}/doinst.sh install/
install -m644 ${CWD}/slack-desc install/
install -m644 ${CWD}/slack-required install/
makepkg -l y -c n ${CWD}/${NAME}-${VERSION}-${ARCH}-${BUILD}.txz
rm -rf ${PKG}
# End ${edi_name}.SlackBuild

@ -1,4 +0,0 @@
MAINTAINERCLEANFILES = Makefile.in
EXTRA_DIST = doinst.sh ${edi_name}.SlackBuild slack-desc slack-required

@ -1 +0,0 @@
# Stuff done after package installation

@ -1,19 +0,0 @@
# HOW TO EDIT THIS FILE:
# The "handy ruler" below makes it easier to edit a package description. Line
# up the first '|' above the ':' following the base package name, and the '|'
# on the right side marks the last column you can put a character in. You must
# make exactly 11 lines for the formatting to be correct. It's also
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
${edi_name}: ${edi_name}
${edi_name}:
${edi_name}: ${Edi_Name} is an example of application written using the Enlightenment
${edi_name}: Foundation Libraries.
${edi_name}:
${edi_name}: It requires elementary.
${edi_name}:
${edi_name}: ${edi_name} was written by ${Edi_User} <${Edi_Email}>
${edi_name}: website: <http://${Edi_Url}/>
${edi_name}:
${edi_name}:

@ -1,5 +0,0 @@
eina >= 1.8.0
evas >= 1.8.0
ecore >= 1.8.0
edje >= 1.8.0
elementary >= 1.8.0

@ -5,7 +5,7 @@ pkgrel=1
pkgdesc="Enlightenment toolkit edi - GIT development snapshot"
arch=('i686' 'x86_64' 'arm')
url="http://andywilliams.me"
license=('WTFPL')
license=('GPLv2')
makedepends=('doxygen' 'imagemagick' 'git')
depends=('efl-git')
options=('!libtool' 'debug')

Loading…
Cancel
Save