Katello · bbuckingham · Aug 2, 2012 · Jul 19, 2012 · Jul 19, 2012 · Jul 19, 2012
diff --git a/agent/katello-agent.spec b/agent/katello-agent.spec
@@ -1,13 +1,11 @@
-%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
-
 Name: katello-agent
-Version: 1.0.4
+Version: 1.1.0
 Release: 1%{?dist}
 Summary: The Katello Agent
 Group:   Development/Languages
 License: LGPLv2
-URL: https://fedorahosted.org/pulp/
-Source0: %{name}-%{version}.tar.gz
+URL:     https://fedorahosted.org/katello/
+Source0: https://fedorahosted.org/releases/k/a/katello/%{name}-%{version}.tar.gz
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 BuildRequires: python2-devel
@@ -16,8 +14,10 @@ BuildRequires: rpm-python
 Requires: gofer >= 0.60
 Requires: gofer-package >= 0.60
 Requires: subscription-manager
+
 %description
-The Katello agent.
+Provides plugin for gofer, which allows communicating with Katello server
+and execute scheduled actions.
 
 %prep
 %setup -q
@@ -28,22 +28,34 @@ pushd src
 popd
 
 %install
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
 mkdir -p %{buildroot}/%{_sysconfdir}/gofer/plugins
-mkdir -p %{buildroot}/%{_libdir}/gofer/plugins
+mkdir -p %{buildroot}/%{_prefix}/lib/gofer/plugins
 
 cp etc/gofer/plugins/katelloplugin.conf %{buildroot}/%{_sysconfdir}/gofer/plugins
-cp src/katello/agent/katelloplugin.py %{buildroot}/%{_libdir}/gofer/plugins
+cp src/katello/agent/katelloplugin.py %{buildroot}/%{_prefix}/lib/gofer/plugins
 
 %clean
 rm -rf %{buildroot}
 
 %files
 %config(noreplace) %{_sysconfdir}/gofer/plugins/katelloplugin.conf
-%{_libdir}/gofer/plugins/katelloplugin.*
+%{_prefix}/lib/gofer/plugins/katelloplugin.*
 %doc LICENSE
 
 %changelog
+* Tue Jul 31 2012 Miroslav Suchý <msuchy@redhat.com> 1.0.6-1
+- update copyright years (msuchy@redhat.com)
+- point Source0 to fedorahosted.org where tar.gz are stored (msuchy@redhat.com)
+
+* Fri Jul 27 2012 Lukas Zapletal <lzap+git@redhat.com> 1.0.5-1
+- macro python_sitelib is not used anywhere, removing
+- provide more descriptive description
+- put plugins into correct location
+- build root is not used since el6 (inclusive)
+- point URL to our wiki
+- %%defattr is not needed since rpm 4.4
+
 * Wed Jun 27 2012 Lukas Zapletal <lzap+git@redhat.com> 1.0.4-1
 - 828533 - changing to proper QPIDD SSL port
 

diff --git a/agent/src/katello/agent/katelloplugin.py b/agent/src/katello/agent/katelloplugin.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2011 Red Hat, Inc.
+# Copyright (c) 2012 Red Hat, Inc.
 #
 # This software is licensed to you under the GNU General Public
 # License as published by the Free Software Foundation; either version

diff --git a/certs-tools/certs/katello_ssl_tool.py b/certs-tools/certs/katello_ssl_tool.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 #
-# Copyright (c) 2008--2010 Red Hat, Inc.
+# Copyright (c) 2008--2012 Red Hat, Inc.
 #
 # This software is licensed to you under the GNU General Public License,
 # version 2 (GPLv2). There is NO WARRANTY for this software, express or

diff --git a/certs-tools/certs/sslToolCli.py b/certs-tools/certs/sslToolCli.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2008--2010 Red Hat, Inc.
+# Copyright (c) 2008--2012 Red Hat, Inc.
 #
 # This software is licensed to you under the GNU General Public License,
 # version 2 (GPLv2). There is NO WARRANTY for this software, express or

diff --git a/certs-tools/certs/sslToolConfig.py b/certs-tools/certs/sslToolConfig.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2008--2010 Red Hat, Inc.
+# Copyright (c) 2008--2012 Red Hat, Inc.
 #
 # This software is licensed to you under the GNU General Public License,
 # version 2 (GPLv2). There is NO WARRANTY for this software, express or

diff --git a/certs-tools/certs/sslToolLib.py b/certs-tools/certs/sslToolLib.py
@@ -1,5 +1,5 @@
 #
-# Copyright (c) 2008--2010 Red Hat, Inc.
+# Copyright (c) 2008--2012 Red Hat, Inc.
 #
 # This software is licensed to you under the GNU General Public License,
 # version 2 (GPLv2). There is NO WARRANTY for this software, express or

diff --git a/certs-tools/gen-rpm.sh b/certs-tools/gen-rpm.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (c) 2008 Red Hat, Inc.
+# Copyright (c) 2012 Red Hat, Inc.
 #
 # This software is licensed to you under the GNU General Public License,
 # version 2 (GPLv2). There is NO WARRANTY for this software, express or

diff --git a/certs-tools/katello-certs-tools.spec b/certs-tools/katello-certs-tools.spec
@@ -2,11 +2,10 @@ Name: katello-certs-tools
 Summary: Katello SSL Key/Cert Tool
 Group: Applications/Internet
 License: GPLv2 and Python
-Version: 1.1.6
+Version: 1.1.7
 Release: 1%{?dist}
 URL:      https://fedorahosted.org/katello
 Source0:  https://fedorahosted.org/releases/k/a/katello/%{name}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildArch: noarch
 Requires: openssl rpm-build
 BuildRequires: docbook-utils
@@ -24,13 +23,9 @@ Katello.
 %{__python} setup.py build
 
 %install
-rm -rf $RPM_BUILD_ROOT
 %{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
 chmod +x $RPM_BUILD_ROOT/%{python_sitelib}/certs/katello_ssl_tool.py
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
 %files
 %{python_sitelib}/*
 %{_datarootdir}/katello/certs
@@ -41,6 +36,10 @@ rm -rf $RPM_BUILD_ROOT
 %doc LICENSE PYTHON-LICENSES.txt
 
 %changelog
+* Tue Jul 31 2012 Miroslav Suchý <msuchy@redhat.com> 1.1.7-1
+- update copyright years (msuchy@redhat.com)
+- %%defattr is not needed since rpm 4.4 (msuchy@redhat.com)
+
 * Thu May 10 2012 Lukas Zapletal <lzap+git@redhat.com> 1.1.6-1
 - 818261 - consumer rpm was not installable on RHEL5
 

diff --git a/certs-tools/katello-ssl-tool b/certs-tools/katello-ssl-tool
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 #
-# Copyright (c) 2008 Red Hat, Inc.
+# Copyright (c) 2012 Red Hat, Inc.
 #
 # This software is licensed to you under the GNU General Public License,
 # version 2 (GPLv2). There is NO WARRANTY for this software, express or

diff --git a/certs-tools/setup.py b/certs-tools/setup.py
@@ -1,7 +1,7 @@
 from distutils.core import setup
 
 setup(name='katello-certs-tools',
-      version='1.1.6',
+      version='1.1.7',
       description='Python modules used for Katello SSL tooling',
       author='Tomas Lestach',
       author_email='tlestach@redhat.com',

diff --git a/certs-tools/sign.sh b/certs-tools/sign.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 #
-# Copyright (c) 2008 Red Hat, Inc.
+# Copyright (c) 2012 Red Hat, Inc.
 #
 # This software is licensed to you under the GNU General Public License,
 # version 2 (GPLv2). There is NO WARRANTY for this software, express or

diff --git a/cli/bin/katello b/cli/bin/katello
@@ -1,7 +1,7 @@
 #!/usr/bin/python
 #
 # Katello Shell
-# Copyright (c) 2010 Red Hat, Inc.
+# Copyright (c) 2012 Red Hat, Inc.
 #
 # This software is licensed to you under the GNU General Public License,
 # version 2 (GPLv2). There is NO WARRANTY for this software, express or

diff --git a/cli/katello-cli.spec b/cli/katello-cli.spec
@@ -19,18 +19,9 @@ Summary:       Client package for managing application life-cycle for Linux syst
 Group:         Applications/System
 License:       GPLv2
 URL:           http://www.katello.org
-Version:       0.2.43
+Version:       1.1.0
 Release:       1%{?dist}
-
-# Upstream uses tito rpm helper utility. To get the particular version from
-# git, do the following commands:
-#   git clone git://github.com/Katello/katello.git && cd cli
-#   tito build --tgz --offline --tag=%{name}-%{version}-1
-Source0:       %{name}-%{version}.tar.gz
-
-# we need to keep RHEL compatibility
-BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
+Source0:       https://fedorahosted.org/releases/k/a/katello/%{name}-%{version}.tar.gz
 Requires:      %{base_name}-cli-common
 BuildArch:     noarch
 
@@ -69,7 +60,6 @@ sed -e 's/THE_VERSION/%{version}/g' katello-debug-certificates.pod |\
 popd
 
 %install
-rm -rf %{buildroot}
 install -d %{buildroot}%{_bindir}/
 install -d %{buildroot}%{_sysconfdir}/%{base_name}/
 install -d %{buildroot}%{python_sitelib}/%{base_name}
@@ -94,11 +84,6 @@ install -m 0644 man/%{base_name}-debug-certificates.man1 %{buildroot}%{_mandir}/
 # several scripts are executable
 chmod 755 %{buildroot}%{python_sitelib}/%{base_name}/client/main.py
 
-
-# we need to keep RHEL compatibility
-%clean
-rm -rf %{buildroot}
-
 %files 
 %attr(755,root,root) %{_bindir}/%{base_name}
 %attr(755,root,root) %{_bindir}/%{base_name}-debug-certificates
@@ -112,6 +97,23 @@ rm -rf %{buildroot}
 
 
 %changelog
+* Tue Jul 31 2012 Miroslav Suchý <msuchy@redhat.com> 1.0.1-1
+- bump up version to 1.0 (msuchy@redhat.com)
+- update copyright years (msuchy@redhat.com)
+- point Source0 to fedorahosted.org where tar.gz are stored (msuchy@redhat.com)
+
+* Wed Jul 25 2012 Miroslav Suchý <msuchy@redhat.com> 0.2.45-1
+- 840531 - Fixes issue with inability to individually promote packages attached
+  to a system template or changeset that have more than a single dash in the
+  name. (ehelms@redhat.com)
+- 817845 - updating katello man page entry (adprice@redhat.com)
+
+* Mon Jul 23 2012 Lukas Zapletal <lzap+git@redhat.com> 0.2.44-1
+- system groups - API accepts max_systems and CLI unit tests
+- system groups - wrong variable name in error message
+- system groups - removing local modifications not intended for upstream
+- group copy cli and API first pass
+
 * Mon Jul 16 2012 Lukas Zapletal <lzap+git@redhat.com> 0.2.43-1
 - 798323 - remove double setting of UTF decoder
 - system groups - removing the 'locked' feature from system groups UI/API/CLI

diff --git a/cli/man/katello.pod b/cli/man/katello.pod
@@ -5,16 +5,18 @@ katello - Katello command line tool
 =head1 SYNOPSIS
 
   katello [options] command [parameter1] [parameterN] ...
+
+    Options include:
       [ -h | --help ]
       [ -u | --username ]
       [ -p | --password ]
       [ --host ]
 
-Commands and parameters are described bellow.
+Commands and parameters are described below.
 
 =head1 DESCRIPTION
 
-The B<katello> program is an command line application for interaction with
+The B<katello> program is an command line application for interaction with a
 Katello instance. It can be used by Katello administrators and users to
 execute regular tasks. There is a built-in shell avaiable that can be used
 for scripting purposes.
@@ -26,7 +28,7 @@ for scripting purposes.
 
 THE_USAGE
 
-For more information about commands and particular action please use:
+For more information about commands and particular actions please use:
 
   katello command action --help
 

diff --git a/cli/src/katello/client/api/activation_key.py b/cli/src/katello/client/api/activation_key.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2011 Red Hat, Inc.
+# Copyright © 2012 Red Hat, Inc.
 #
 # This software is licensed to you under the GNU General Public License,
 # version 2 (GPLv2). There is NO WARRANTY for this software, express or

diff --git a/cli/src/katello/client/api/changeset.py b/cli/src/katello/client/api/changeset.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2011 Red Hat, Inc.
+# Copyright © 2012 Red Hat, Inc.
 #
 # This software is licensed to you under the GNU General Public License,
 # version 2 (GPLv2). There is NO WARRANTY for this software, express or

diff --git a/cli/src/katello/client/api/environment.py b/cli/src/katello/client/api/environment.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2011 Red Hat, Inc.
+# Copyright © 2012 Red Hat, Inc.
 #
 # This software is licensed to you under the GNU General Public License,
 # version 2 (GPLv2). There is NO WARRANTY for this software, express or

diff --git a/cli/src/katello/client/api/errata.py b/cli/src/katello/client/api/errata.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2011 Red Hat, Inc.
+# Copyright © 2012 Red Hat, Inc.
 #
 # This software is licensed to you under the GNU General Public License,
 # version 2 (GPLv2). There is NO WARRANTY for this software, express or

diff --git a/cli/src/katello/client/api/filter.py b/cli/src/katello/client/api/filter.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2011 Red Hat, Inc.
+# Copyright © 2012 Red Hat, Inc.
 #
 # This software is licensed to you under the GNU General Public License,
 # version 2 (GPLv2). There is NO WARRANTY for this software, express or

diff --git a/cli/src/katello/client/api/gpg_key.py b/cli/src/katello/client/api/gpg_key.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2011 Red Hat, Inc.
+# Copyright © 2012 Red Hat, Inc.
 #
 # This software is licensed to you under the GNU General Public License,
 # version 2 (GPLv2). There is NO WARRANTY for this software, express or

diff --git a/cli/src/katello/client/api/job.py b/cli/src/katello/client/api/job.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2011 Red Hat, Inc.
+# Copyright © 2012 Red Hat, Inc.
 #
 # This software is licensed to you under the GNU General Public License,
 # version 2 (GPLv2). There is NO WARRANTY for this software, express or

diff --git a/cli/src/katello/client/api/organization.py b/cli/src/katello/client/api/organization.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2011 Red Hat, Inc.
+# Copyright © 2012 Red Hat, Inc.
 #
 # This software is licensed to you under the GNU General Public License,
 # version 2 (GPLv2). There is NO WARRANTY for this software, express or

diff --git a/cli/src/katello/client/api/package.py b/cli/src/katello/client/api/package.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2011 Red Hat, Inc.
+# Copyright © 2012 Red Hat, Inc.
 #
 # This software is licensed to you under the GNU General Public License,
 # version 2 (GPLv2). There is NO WARRANTY for this software, express or

diff --git a/cli/src/katello/client/api/permission.py b/cli/src/katello/client/api/permission.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2011 Red Hat, Inc.
+# Copyright © 2012 Red Hat, Inc.
 #
 # This software is licensed to you under the GNU General Public License,
 # version 2 (GPLv2). There is NO WARRANTY for this software, express or

diff --git a/cli/src/katello/client/api/product.py b/cli/src/katello/client/api/product.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2011 Red Hat, Inc.
+# Copyright © 2012 Red Hat, Inc.
 #
 # This software is licensed to you under the GNU General Public License,
 # version 2 (GPLv2). There is NO WARRANTY for this software, express or

diff --git a/cli/src/katello/client/api/provider.py b/cli/src/katello/client/api/provider.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2011 Red Hat, Inc.
+# Copyright © 2012 Red Hat, Inc.
 #
 # This software is licensed to you under the GNU General Public License,
 # version 2 (GPLv2). There is NO WARRANTY for this software, express or

diff --git a/cli/src/katello/client/api/repo.py b/cli/src/katello/client/api/repo.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2011 Red Hat, Inc.
+# Copyright © 2012 Red Hat, Inc.
 #
 # This software is licensed to you under the GNU General Public License,
 # version 2 (GPLv2). There is NO WARRANTY for this software, express or

diff --git a/cli/src/katello/client/api/sync_plan.py b/cli/src/katello/client/api/sync_plan.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2011 Red Hat, Inc.
+# Copyright © 2012 Red Hat, Inc.
 #
 # This software is licensed to you under the GNU General Public License,
 # version 2 (GPLv2). There is NO WARRANTY for this software, express or

diff --git a/cli/src/katello/client/api/system.py b/cli/src/katello/client/api/system.py
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 #
-# Copyright © 2011 Red Hat, Inc.
+# Copyright © 2012 Red Hat, Inc.
 #
 # This software is licensed to you under the GNU General Public License,
 # version 2 (GPLv2). There is NO WARRANTY for this software, express or