Misc. changes from the Fedora package review.

6 files changed, 31 insertions, 21 deletions

diff --git a/COPYING b/LICENSE
index e77696a..08ddefd 100644
--- a/COPYING
+++ b/LICENSE
@@ -1,8 +1,8 @@
 		    GNU GENERAL PUBLIC LICENSE
 		       Version 2, June 1991
 
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
-                          675 Mass Ave, Cambridge, MA 02139, USA
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -15,7 +15,7 @@ software--to make sure the software is free for all its users.  This
 General Public License applies to most of the Free Software
 Foundation's software and to any other program whose authors commit to
 using it.  (Some other Free Software Foundation software is covered by
-the GNU Library General Public License instead.)  You can apply it to
+the GNU Lesser General Public License instead.)  You can apply it to
 your programs, too.
 
   When we speak of free software, we are referring to freedom, not
@@ -55,7 +55,7 @@ patent must be licensed for everyone's free use or not licensed at all.
 
   The precise terms and conditions for copying, distribution and
 modification follow.
-
+
 		    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
@@ -110,7 +110,7 @@ above, provided that you also meet all of these conditions:
     License.  (Exception: if the Program itself is interactive but
     does not normally print such an announcement, your work based on
     the Program is not required to print an announcement.)
-
+
 These requirements apply to the modified work as a whole.  If
 identifiable sections of that work are not derived from the Program,
 and can be reasonably considered independent and separate works in
@@ -168,7 +168,7 @@ access to copy from a designated place, then offering equivalent
 access to copy the source code from the same place counts as
 distribution of the source code, even though third parties are not
 compelled to copy the source along with the object code.
-
+
   4. You may not copy, modify, sublicense, or distribute the Program
 except as expressly provided under this License.  Any attempt
 otherwise to copy, modify, sublicense or distribute the Program is
@@ -225,7 +225,7 @@ impose that choice.
 
 This section is intended to make thoroughly clear what is believed to
 be a consequence of the rest of this License.
-
+
   8. If the distribution and/or use of the Program is restricted in
 certain countries either by patents or by copyrighted interfaces, the
 original copyright holder who places the Program under this License
@@ -278,7 +278,7 @@ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
 POSSIBILITY OF SUCH DAMAGES.
 
 		     END OF TERMS AND CONDITIONS
-
+
 	    How to Apply These Terms to Your New Programs
 
   If you develop a new program, and you want it to be of the greatest
@@ -291,7 +291,7 @@ convey the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
     <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) 19yy  <name of author>
+    Copyright (C) <year>  <name of author>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -303,16 +303,16 @@ the "copyright" line and a pointer to where the full notice is found.
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
-    You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    You should have received a copy of the GNU General Public License along
+    with this program; if not, write to the Free Software Foundation, Inc.,
+    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 Also add information on how to contact you by electronic and paper mail.
 
 If the program is interactive, make it output a short notice like this
 when it starts in an interactive mode:
 
-    Gnomovision version 69, Copyright (C) 19yy name of author
+    Gnomovision version 69, Copyright (C) year name of author
     Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.
@@ -335,5 +335,6 @@ necessary.  Here is a sample; alter the names:
 This General Public License does not permit incorporating your program into
 proprietary programs.  If your program is a subroutine library, you may
 consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Library General
+library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.
+
diff --git a/MANIFEST.in b/MANIFEST.in
index a81777a..bc0e08b 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -5,5 +5,6 @@ recursive-include init-scripts *
 recursive-include po *.po
 recursive-include po *.pot
 include AUTHORS
+include LICENSE
 include README
 
diff --git a/func.spec b/func.spec
index 929c91a..a8a21bd 100644
--- a/func.spec
+++ b/func.spec
@@ -7,11 +7,16 @@ Source1: version
 Version: %(echo `awk '{ print $1 }' %{SOURCE1}`)
 Release: %(echo `awk '{ print $2 }' %{SOURCE1}`)%{?dist}
 Source0: %{name}-%{version}.tar.gz
-License: GPL+
+License: GPLv2+
 Group: Applications/System
 Requires: python >= 2.3
 Requires: pyOpenSSL
 BuildRequires: python-devel
+%if 0%{?fedora} >= 8
+BuildRequires: python-setuptools-devel
+%else
+BuildRequires: python-setuptools
+%endif
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
 BuildArch: noarch
 Url: https://hosted.fedoraproject.org/projects/func/
@@ -34,6 +39,7 @@ test "x$RPM_BUILD_ROOT" != "x" && rm -rf $RPM_BUILD_ROOT
 rm -fr $RPM_BUILD_ROOT
 
 %files
+%defattr(-, root, root, -)
 %{_bindir}/funcd
 %{_bindir}/func
 %{_bindir}/certmaster
@@ -58,7 +64,7 @@ rm -fr $RPM_BUILD_ROOT
 %dir %{python_sitelib}/func/minion/modules
 %{python_sitelib}/func/minion/modules/*.py*
 %dir /var/log/func
-%doc AUTHORS README
+%doc AUTHORS README LICENSE
 %{_mandir}/man1/func.1.gz
 %{_mandir}/man1/func-inventory.1.gz
 %{_mandir}/man1/funcd.1.gz
@@ -68,6 +74,7 @@ rm -fr $RPM_BUILD_ROOT
 
 %post
 /sbin/chkconfig --add funcd
+/sbin/chkconfig --add certmaster
 exit 0
 
 %preun
@@ -78,6 +85,9 @@ fi
 
 
 %changelog
+* Fri Oct 26 2007 Michael DeHaan <mdehaan@redhat.com> - 0.0.13-3
+- Misc fixes per Fedora package-review
+
 * Wed Oct 24 2007 Michael DeHaan <mdehaan@redhat.com> - 0.0.13-2
 - packaged func-inventory and associated manpage
 - release bump for Fedora submission
diff --git a/init-scripts/certmaster b/init-scripts/certmaster
index 71d5d8a..11a4539 100755
--- a/init-scripts/certmaster
+++ b/init-scripts/certmaster
@@ -8,14 +8,13 @@
 ### BEGIN INIT INFO
 # Provides: certmaster
 # Required-Start: network
-# Default-Start: 3 4 5
 # Short-Description: certificate master for Fedora Unified Network Control 'master server only'
 # Description: certificate master to sign/manage ca/cert infrastructure for func
 ### END INIT INFO
 
 # chkconfig header
 
-# chkconfig: 345 98 99 
+# chkconfig: - 98 99 
 # description:  certificate master to sign/manage ca/cert infrastructure for func
 #
 # processname: /usr/bin/certmaster
diff --git a/init-scripts/funcd b/init-scripts/funcd
index 4971feb..72e2de5 100755
--- a/init-scripts/funcd
+++ b/init-scripts/funcd
@@ -8,14 +8,13 @@
 ### BEGIN INIT INFO
 # Provides: funcd
 # Required-Start: network, xinetd, httpd
-# Default-Start: 3 4 5
 # Short-Description: Fedora Unified Network Control
 # Description: Crazy simple, secure remote management.
 ### END INIT INFO
 
 # chkconfig header
 
-# chkconfig: 345 99 99 
+# chkconfig: - 99 99 
 # description:  Crazy simple, secure remote management.
 #
 # processname: /usr/bin/funcd
diff --git a/version b/version
index 169a25c..91bcf6d 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-0.13 2
+0.13 3