aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--python/python-django/slack-desc19
-rw-r--r--python/python2-django/README (renamed from python/python-django/README)4
-rw-r--r--python/python2-django/python2-django.SlackBuild (renamed from python/python-django/python-django.SlackBuild)10
-rw-r--r--python/python2-django/python2-django.info (renamed from python/python-django/python-django.info)2
-rw-r--r--python/python2-django/slack-desc19
5 files changed, 27 insertions, 27 deletions
diff --git a/python/python-django/slack-desc b/python/python-django/slack-desc
deleted file mode 100644
index e7b12ea9ae01..000000000000
--- a/python/python-django/slack-desc
+++ /dev/null
@@ -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 ':' except on otherwise blank lines.
-
- |-----handy-ruler------------------------------------------------------|
-python-django: python-django (The Web framework for perfectionists with deadlines)
-python-django:
-python-django: Django is a high-level Python Web framework that encourages rapid
-python-django: development and clean, pragmatic design.
-python-django:
-python-django: Homepage: https://github.com/django/
-python-django:
-python-django:
-python-django:
-python-django:
-python-django:
diff --git a/python/python-django/README b/python/python2-django/README
index a4d5bb41a9d3..cf947348a5c4 100644
--- a/python/python-django/README
+++ b/python/python2-django/README
@@ -1,4 +1,4 @@
python-django (The Web framework for perfectionists with deadlines)
-Django is a high-level Python Web framework that encourages rapid development
-and clean, pragmatic design.
+Django is a high-level Python Web framework that encourages rapid
+development and clean, pragmatic design.
diff --git a/python/python-django/python-django.SlackBuild b/python/python2-django/python2-django.SlackBuild
index 2c1a0bb940da..063f3c27ca2f 100644
--- a/python/python-django/python-django.SlackBuild
+++ b/python/python2-django/python2-django.SlackBuild
@@ -22,7 +22,7 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-PRGNAM=python-django
+PRGNAM=python2-django
SRCNAM=django
VERSION=${VERSION:-1.11.18}
BUILD=${BUILD:-1}
@@ -30,7 +30,7 @@ TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
case "$( uname -m )" in
- i?86) ARCH=i486 ;;
+ i?86) ARCH=i586 ;;
arm*) ARCH=arm ;;
*) ARCH=$( uname -m ) ;;
esac
@@ -41,8 +41,8 @@ TMP=${TMP:-/tmp/SBo}
PKG=$TMP/package-$PRGNAM
OUTPUT=${OUTPUT:-/tmp}
-if [ "$ARCH" = "i486" ]; then
- SLKCFLAGS="-O2 -march=i486 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+ SLKCFLAGS="-O2 -march=i586 -mtune=i686"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O2 -march=i686 -mtune=i686"
@@ -70,7 +70,7 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
-python setup.py install --root=$PKG --prefix=/usr
+python2 setup.py install --root=$PKG --prefix=/usr
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp -a AUTHORS CONTRIBUTING.rst INSTALL LICENSE README.rst \
diff --git a/python/python-django/python-django.info b/python/python2-django/python2-django.info
index b2443b3f55d4..8c041bc534bb 100644
--- a/python/python-django/python-django.info
+++ b/python/python2-django/python2-django.info
@@ -1,4 +1,4 @@
-PRGNAM="python-django"
+PRGNAM="python2-django"
VERSION="1.11.18"
HOMEPAGE="https://www.djangoproject.com/"
DOWNLOAD="https://github.com/django/django/archive/1.11.18/django-1.11.18.tar.gz"
diff --git a/python/python2-django/slack-desc b/python/python2-django/slack-desc
new file mode 100644
index 000000000000..732b4ba6d533
--- /dev/null
+++ b/python/python2-django/slack-desc
@@ -0,0 +1,19 @@
+# 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 ':' except on otherwise blank lines.
+
+ |-----handy-ruler------------------------------------------------------|
+python2-django: python2-django (The Web framework for perfectionists with deadlines)
+python2-django:
+python2-django: Django is a high-level Python Web framework that encourages rapid
+python2-django: development and clean, pragmatic design.
+python2-django:
+python2-django: Homepage: https://github.com/django/
+python2-django:
+python2-django:
+python2-django:
+python2-django:
+python2-django: