[copr] master: move copr-cli to separate package (f33ea1d)

Repository : http://git.fedorahosted.org/cgit/copr.git On branch : master commit f33ea1d7522acd46fea6295d2aedfb650208c7c1 Author: Miroslav Suchý <msuchy(a)redhat.com&gt; Date: Tue Mar 18 14:44:15 2014 +0100 move copr-cli to separate package LICENSE => cli/LICENSE | 0 cli_requirements.txt => cli/cli_requirements.txt | 0 copr.spec => cli/copr-cli.spec | 29 ++++--------------- {copr_cli => cli/copr_cli}/README.rst | 0 {copr_cli => cli/copr_cli}/__init__.py | 0 {copr_cli => cli/copr_cli}/copr_exceptions.py | 0 {copr_cli => cli/copr_cli}/main.py | 0 {copr_cli => cli/copr_cli}/subcommands.py | 0 coprcli-setup.py => cli/coprcli-setup.py | 8 +++-- {documentation => cli/documentation}/Makefile | 2 +- .../how-to-generate-documentation.txt | 0 {man => cli/man}/copr-cli.1.asciidoc | 0 man/copr-selinux-enable.8.asciidoc | 28 ------------------- man/copr-selinux-relabel.8.asciidoc | 28 ------------------- 14 files changed, 12 insertions(+), 83 deletions(-) diff --git a/LICENSE b/cli/LICENSE similarity index 100% rename from LICENSE rename to cli/LICENSE diff --git a/cli_requirements.txt b/cli/cli_requirements.txt similarity index 100% rename from cli_requirements.txt rename to cli/cli_requirements.txt diff --git a/copr.spec b/cli/copr-cli.spec similarity index 97% rename from copr.spec rename to cli/copr-cli.spec index b139d34..b45f32a 100644 --- a/copr.spec +++ b/cli/copr-cli.spec @@ -3,20 +3,18 @@ %global __python2 %{__python} %endif -Name: copr +Name: copr-cli Version: 1.28 Release: 1%{?dist} -Summary: Cool Other Package Repo +Summary: Command line interface for COPR Group: Applications/Productivity License: GPLv2+ URL: https://fedorahosted.org/copr/ # Source is created by # git clone https://git.fedorahosted.org/git/copr.git -# cd copr +# cd copr/cli # tito build --tgz -# content is same as https://git.fedorahosted.org/cgit/copr.git/snapshot/%{name}-%{version}-1.... -# but checksum does not match due different metadata Source0: %{name}-%{version}.tar.gz BuildArch: noarch @@ -26,9 +24,6 @@ BuildRequires: util-linux BuildRequires: python-setuptools BuildRequires: python-requests BuildRequires: python2-devel -%if %{with_server} -BuildRequires: systemd -%endif %if 0%{?rhel} < 7 && 0%{?rhel} > 0 BuildRequires: python-argparse %endif @@ -37,22 +32,13 @@ BuildRequires: epydoc BuildRequires: graphviz BuildRequires: make -%description -COPR is lightweight build system. It allows you to create new project in WebUI, -and submit new builds and COPR will create yum repository from latest builds. - -%package cli -Summary: Command line interface for COPR Requires: python-requests Requires: python-setuptools -%if 0%{?rhel} < 6 && 0%{?rhel} > 0 -Group: Applications/Productivity -%endif %if 0%{?rhel} < 7 && 0%{?rhel} > 0 Requires: python-argparse %endif -%description cli +%description COPR is lightweight build system. It allows you to create new project in WebUI, and submit new builds and COPR will create yum repository from latests builds. @@ -85,8 +71,7 @@ make %{?_smp_mflags} python popd %install - -#copr-cli +install -d %{buildroot}%{_pkgdocdir}/ %{__python2} coprcli-setup.py install --root %{buildroot} install -d %{buildroot}%{_mandir}/man1 install -p -m 644 man/copr-cli.1 %{buildroot}/%{_mandir}/man1/ @@ -94,9 +79,7 @@ install -p -m 644 man/copr-cli.1 %{buildroot}/%{_mandir}/man1/ #doc cp -a documentation/python-doc %{buildroot}%{_pkgdocdir}/ - - -%files cli +%files %doc LICENSE README.rst %{_bindir}/copr-cli %{python_sitelib}/* diff --git a/copr_cli/README.rst b/cli/copr_cli/README.rst similarity index 100% rename from copr_cli/README.rst rename to cli/copr_cli/README.rst diff --git a/copr_cli/__init__.py b/cli/copr_cli/__init__.py similarity index 100% rename from copr_cli/__init__.py rename to cli/copr_cli/__init__.py diff --git a/copr_cli/copr_exceptions.py b/cli/copr_cli/copr_exceptions.py similarity index 100% rename from copr_cli/copr_exceptions.py rename to cli/copr_cli/copr_exceptions.py diff --git a/copr_cli/main.py b/cli/copr_cli/main.py similarity index 100% rename from copr_cli/main.py rename to cli/copr_cli/main.py diff --git a/copr_cli/subcommands.py b/cli/copr_cli/subcommands.py similarity index 100% rename from copr_cli/subcommands.py rename to cli/copr_cli/subcommands.py diff --git a/coprcli-setup.py b/cli/coprcli-setup.py similarity index 75% rename from coprcli-setup.py rename to cli/coprcli-setup.py index ed7eb57..fa67387 100644 --- a/coprcli-setup.py +++ b/cli/coprcli-setup.py @@ -4,10 +4,12 @@ from setuptools import setup import sys -f = open('README') -long_description = f.read().strip() -f.close() +long_description = """Copr is designed to be a lightweight buildsystem that allows contributors +to create packages, put them in repositories, and make it easy for users +to install the packages onto their system. Within the Fedora Project it +is used to allow packagers to create third party repositories. +This part is a command line interface to use copr.""" from copr_cli.main import __description__, __version__ diff --git a/documentation/Makefile b/cli/documentation/Makefile similarity index 94% rename from documentation/Makefile rename to cli/documentation/Makefile index fe284a6..d866287 100644 --- a/documentation/Makefile +++ b/cli/documentation/Makefile @@ -13,7 +13,7 @@ BUILD_DIR := build EPYDOC_BIN := `which epydoc` EPYDOC_SWITCHES := --inheritance listed --graph all --html PYTHON_DOC_DIR := python-doc -PYTHON_DIRS := ../backend ../copr_cli ../coprs_frontend +PYTHON_DIRS := ../copr_cli # TARGETS # schema is not incldued here, since you need a live db diff --git a/documentation/how-to-generate-documentation.txt b/cli/documentation/how-to-generate-documentation.txt similarity index 100% rename from documentation/how-to-generate-documentation.txt rename to cli/documentation/how-to-generate-documentation.txt diff --git a/man/copr-cli.1.asciidoc b/cli/man/copr-cli.1.asciidoc similarity index 100% rename from man/copr-cli.1.asciidoc rename to cli/man/copr-cli.1.asciidoc diff --git a/man/copr-selinux-enable.8.asciidoc b/man/copr-selinux-enable.8.asciidoc deleted file mode 100644 index 63a57ae..0000000 --- a/man/copr-selinux-enable.8.asciidoc +++ /dev/null @@ -1,28 +0,0 @@ -copr-selinux-enable(8) -===================== -:man source: copr -:man manual: COPR - -NAME ----- - -copr-selinux-enable - enable Copr SELinux policy - -SYNOPSIS --------- - -copr-selinux-enable - -DESCRIPTION ------------ - -The *copr-selinux-enable* program will install and enable the Copr -SELinux module and set the required SELinux flags. - -The program is called by an rpm post script and it -is not usually required to run it manually. - -SEE ALSO --------- - -copr-selinux-relabel(8) diff --git a/man/copr-selinux-relabel.8.asciidoc b/man/copr-selinux-relabel.8.asciidoc deleted file mode 100644 index 59bbab8..0000000 --- a/man/copr-selinux-relabel.8.asciidoc +++ /dev/null @@ -1,28 +0,0 @@ -copr-selinux-relabel(8) -===================== -:man source: copr -:man manual: COPR - -NAME ----- - -copr-selinux-relabel - call restorecon on Copr files - -SYNOPSIS --------- - -copr-selinux-relabel - -DESCRIPTION ------------ - -The *copr-selinux-relabel* program will call restorecon(8) on all -Copr files. This effectively restores the SELinux context. - -The program is called by an rpm post script and it -is not usually required to run it manually. - -SEE ALSO --------- - -copr-selinux-enable(8), restorecon(8)