Fixed packaging

config/slpkg.json

@@ -16,6 +16,7 @@
 	"pkg_suffix": ".tgz",
 	"repo_tag": "_SBo",
 	"installpkg": "upgradepkg --install-new",
+	"reinstall": "upgradepkg --reinstall",
 	"removepkg": "removepkg",
 	"colors": "on",
 	"wget_options": "-c -N"

install.sh

@@ -24,8 +24,8 @@
 
 __version() {
 # Grab version from __metadata_.py file
-cat slpkg/__metadata__.py | grep "__version_info__ = (" \
-    | tr -d [[:space:]] | cut -c19-23 | tr , .
+cat slpkg/metadata.py | grep "version_info: tuple = (" \
+    | tr -d [[:space:]] | cut -c21-25 | tr , .
 }
 
 PRGNAM=slpkg

setup.py

@@ -19,7 +19,6 @@ setup(
     keywords=['slackware', 'slpkg', 'update', 'build', 'install', 'remove',
               'slackpkg', 'tool'],
     author=Metadata.author,
-    author_email=Metadata.email,
     url='https://dslackw.gitlab.io/slpkg/',
     package_data={'': ['LICENSE', 'README.rst', 'ChangeLog.txt']},
     data_files=[('/etc/slpkg', ['config/slpkg.json']),

slackbuild/README

@@ -1,4 +1,4 @@
-Slpkg is a powerful software package manager that installs, updates 
+Slpkg is a software package manager that installs, updates 
 and removes packages on Slackware based systems. It automatically 
 computes dependencies and figures out what things should occur 
 to install packages. Slpkg makes it easier to maintain groups 

slackbuild/slack-desc

@@ -8,7 +8,7 @@
      |-----handy-ruler------------------------------------------------------|
 slpkg: slpkg (Slackware Packaging Tool)
 slpkg:
-slpkg: Slpkg is a powerful software package manager that installs, updates,
+slpkg: Slpkg is a software package manager that installs, updates,
 slpkg: and removes packages on Slackware based systems. It automatically 
 slpkg: computes dependencies and figures out what things should occur
 slpkg: to install packages. Slpkg makes it easier to maintain groups of

slackbuild/slpkg.SlackBuild

@@ -24,8 +24,8 @@
 
 __version() {
 # Grab version from __metadata_.py file
-cat ../slpkg/__metadata__.py | grep "__version_info__ = (" \
-    | tr -d [[:space:]] | cut -c19-23 | tr , .
+cat ../slpkg/metadata.py | grep "version_info: tuple = (" \
+    | tr -d [[:space:]] | cut -c21-25 | tr , .
 }
 
 cd $(dirname $0) ; CWD=$(pwd)
@@ -98,10 +98,16 @@ find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | gr
 
 # install configuration files
 mkdir -p $PKG/etc/slpkg
-install -D -m0644 conf/slpkg.json $PKG/etc/slpkg/slpkg.json.new
+install -D -m0644 config/slpkg.json $PKG/etc/slpkg/slpkg.json.new
+
+mkdir -p $PKG/usr/man/man1
+cp man/slpkg.1 $PKG/usr/man/man1
+
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $( find $PKG/usr/man -type l ) ; do ln -s $( readlink $i ).gz $i.gz; rm $i ; done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
-cp -a README.rst ChangeLog.txt LICENSE requirements.txt $PKG/usr/doc/$PRGNAM-$VERSION
+cp -a README.rst ChangeLog.txt LICENSE.txt requirements.txt $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
 
 mkdir -p $PKG/install

slpkg/__init__.py

@@ -1 +0,0 @@
-from main import Flags

slpkg/clean_logs.py

@@ -4,9 +4,9 @@
 
 from dataclasses import dataclass
 
-from views.views import ViewMessage
-from models.models import LogsDependencies
-from models.models import session as Session
+from slpkg.views.views import ViewMessage
+from slpkg.models.models import LogsDependencies
+from slpkg.models.models import session as Session
 
 
 @dataclass

slpkg/cli_menu.py

@@ -1,7 +1,7 @@
 #!/usr/bin/python3
 # -*- coding: utf-8 -*-
 
-from metadata import Metadata
+from slpkg.metadata import Metadata
 
 
 def usage(status):

slpkg/create_data.py

@@ -4,9 +4,9 @@
 
 from dataclasses import dataclass
 
-from metadata import Metadata
-from models.models import SBoTable
-from models.models import session as Session
+from slpkg.metadata import Metadata
+from slpkg.models.models import SBoTable
+from slpkg.models.models import session as Session
 
 
 @dataclass

slpkg/dependencies.py

@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 
 
-from queries import SBoQueries
+from slpkg.queries import SBoQueries
 from dataclasses import dataclass
 
 

slpkg/downloader.py

@@ -4,7 +4,7 @@
 
 import subprocess
 from dataclasses import dataclass
-from metadata import Metadata
+from slpkg.metadata import Metadata
 
 
 @dataclass

slpkg/main.py

@@ -6,13 +6,13 @@ import os
 import sys
 from dataclasses import dataclass
 
-from cli_menu import usage
-from metadata import Metadata
-from queries import SBoQueries
-from slackbuild import Slackbuilds
-from remove_packages import RemovePackages
-from update_repository import UpdateRepository
-from clean_logs import CleanLogsDependencies
+from slpkg.cli_menu import usage
+from slpkg.metadata import Metadata
+from slpkg.queries import SBoQueries
+from slpkg.slackbuild import Slackbuilds
+from slpkg.remove_packages import RemovePackages
+from slpkg.update_repository import UpdateRepository
+from slpkg.clean_logs import CleanLogsDependencies
 
 
 @dataclass

slpkg/models/models.py

@@ -1,7 +1,7 @@
 #!/usr/bin/python3
 # -*- coding: utf-8 -*-
 
-from metadata import Metadata
+from slpkg.metadata import Metadata
 from dataclasses import dataclass
 from sqlalchemy.orm import sessionmaker
 from sqlalchemy.ext.declarative import declarative_base

slpkg/queries.py

@@ -2,9 +2,9 @@
 # -*- coding: utf-8 -*-
 
 
-from metadata import Metadata
-from models.models import SBoTable
-from models.models import session as Session
+from slpkg.metadata import Metadata
+from slpkg.models.models import SBoTable
+from slpkg.models.models import session as Session
 from dataclasses import dataclass
 
 

slpkg/remove_packages.py

@@ -4,12 +4,12 @@
 
 import os
 import subprocess
-from metadata import Metadata
+from slpkg.metadata import Metadata
 
 from dataclasses import dataclass
-from views.views import ViewMessage
-from models.models import LogsDependencies
-from models.models import session as Session
+from slpkg.views.views import ViewMessage
+from slpkg.models.models import LogsDependencies
+from slpkg.models.models import session as Session
 
 
 @dataclass

slpkg/slackbuild.py

@@ -7,14 +7,14 @@ import hashlib
 import subprocess
 from dataclasses import dataclass
 
-from downloader import Wget
-from metadata import Metadata
-from queries import SBoQueries
-from utilities import Utilities
-from dependencies import Requires
-from views.views import ViewMessage
-from models.models import LogsDependencies
-from models.models import session as Session
+from slpkg.downloader import Wget
+from slpkg.metadata import Metadata
+from slpkg.queries import SBoQueries
+from slpkg.utilities import Utilities
+from slpkg.dependencies import Requires
+from slpkg.views.views import ViewMessage
+from slpkg.models.models import LogsDependencies
+from slpkg.models.models import session as Session
 
 
 @dataclass

slpkg/update_repository.py

@@ -4,11 +4,11 @@
 
 import os
 from os import path
-from create_data import CreateData
-from downloader import Wget
-from metadata import Metadata
-from models.models import SBoTable
-from models.models import session as Session
+from slpkg.create_data import CreateData
+from slpkg.downloader import Wget
+from slpkg.metadata import Metadata
+from slpkg.models.models import SBoTable
+from slpkg.models.models import session as Session
 from dataclasses import dataclass
 
 

slpkg/views/views.py

@@ -3,8 +3,8 @@
 
 import os
 from dataclasses import dataclass
-from queries import SBoQueries
-from metadata import Metadata
+from slpkg.queries import SBoQueries
+from slpkg.metadata import Metadata
 
 
 @dataclass