rpms/report/devel .cvsignore, 1.6, 1.7 report.spec, 1.5, 1.6 sources, 1.6, 1.7

[Gavin Romig-Koch]

Author: gavin

Update of /cvs/pkgs/rpms/report/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv22877

Modified Files:
	.cvsignore report.spec sources 
Log Message:
* Tue Mar 23 2010 Gavin Romig-Koch 0.9-1
Resolves: rhbz#562655
- Update to new version in prep for release

* Fri Mar 19 2010 Adam Stokes <ajs at redhat.com> 0.8-5
- report.conf manpage
- report manpage
- do not traceback on empty login
- ask for existing strata case
- setting of config options overrides previous parameter
  if defined.

* Tue Mar 16 2010 Gavin Romig-Koch <gavin at redhat.com> 0.8-4
- add Strata client
- add serialize to report/signature file and read from report/signature file

* Wed Mar 11 2010 Adam Stokes <ajs at redhat.com> 0.8-3
- wrapper function to print to syslog and display io
- build plugins/configs based on distro
- makefile targets for el5.x86/x86_64 el6.x86/x86_64
- copyright addition to bin
- updated createfilesignature to accept binary bool

* Tue Mar 02 2010 Adam Stokes <ajs at redhat.com> 0.8-2
- move all alternatives into templates
- templates accepts overrides from cmdline
- new template ftp




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/report/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- .cvsignore	11 Feb 2010 19:09:41 -0000	1.6
+++ .cvsignore	23 Mar 2010 21:36:59 -0000	1.7
@@ -1 +1 @@
-report-0.8.tar.gz
+report-0.9.tar.gz


Index: report.spec
===================================================================
RCS file: /cvs/pkgs/rpms/report/devel/report.spec,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -p -r1.5 -r1.6
--- report.spec	11 Feb 2010 19:09:41 -0000	1.5
+++ report.spec	23 Mar 2010 21:36:59 -0000	1.6
@@ -1,6 +1,5 @@
-
 Name:           report
-Version:        0.8
+Version:        0.9
 Release:        1%{?dist}
 Summary:        Incident reporting library
 
@@ -11,18 +10,22 @@ Source0:        http://fedorahosted.org/
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 Provides: python-report = %{version}-%{release} 
+Provides: report-devel = %{version}-%{release} 
 
 BuildRequires: python-devel
-
 BuildRequires: openssl-devel
-Requires: openssl
-
+BuildRequires: libxml2-devel
 %if 0%{?rhel} && 0%{?rhel} <= 5
 BuildRequires: curl-devel
 %else
 BuildRequires: libcurl-devel
 %endif  
 
+Requires: openssl report-config-scp report-config-localsave
+Requires: libcurl
+Requires: libxml2
+
+
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
 
 %description
@@ -30,8 +33,6 @@ A generic problem/bug/incident/error rep
 configured to deliver a report to a variety of different ticketing 
 systems.
 
-
-
 %package gtk
 Summary:        GTK IO for reporting library
 Group:          System Environment/Libraries
@@ -42,8 +43,6 @@ Requires: report = %{version}-%{release}
 %description gtk
 Provides GTK IO dialogs for the reporting library
 
-
-
 %package newt
 Summary:        Newt IO for reporting library
 Group:          System Environment/Libraries
@@ -54,8 +53,7 @@ Requires: report = %{version}-%{release}
 %description newt
 Provides Newt IO dialogs for the reporting library
 
-
-
+%if 0%{?fedora}
 %package plugin-bugzilla
 Summary:        Plugin template reporter to bugzilla
 Group:          System Environment/Libraries
@@ -66,9 +64,9 @@ Requires: python-bugzilla
 
 %description plugin-bugzilla
 Plugin template reporter to bugzilla
+%endif
 
-
-
+%if 0%{?rhel}
 %package plugin-RHEL
 Summary:        Plugin template reporter to RHEL
 Group:          System Environment/Libraries
@@ -78,38 +76,78 @@ Requires: rpm-python
 
 %description plugin-RHEL
 Plugin template reporter to RHEL
+%endif
+
+%package plugin-ftp
+Summary:        Plugin template reporter to ftp
+Group:          System Environment/Libraries
+
+Requires: report = %{version}-%{release}
 
+%description plugin-ftp
+Plugin template reporter to ftp
 
+%package plugin-scp
+Summary:        Plugin template reporter to scp
+Group:          System Environment/Libraries
+Requires: report = %{version}-%{release}
+
+%description plugin-scp
+Plugin template reporter to scp
+
+%package plugin-localsave
+Summary:        Plugin template reporter to local directory
+Group:          System Environment/Libraries
+Requires: report = %{version}-%{release}
 
+%description plugin-localsave
+Plugin template reporter to localsave
+
+%package config-ftp
+Summary:        Config for reporter to ftp
+Group:          System Environment/Libraries
+Requires: report-plugin-ftp = %{version}-%{release}
+
+%description config-ftp
+Config for reporter to ftp
+
+%package config-scp
+Summary:        Config for reporter to ftp
+Group:          System Environment/Libraries
+Requires: report-plugin-scp = %{version}-%{release}
+
+%description config-scp
+Config for reporter to scp
+
+%package config-localsave
+Summary:        Config for reporter to ftp
+Group:          System Environment/Libraries
+Requires: report-plugin-localsave = %{version}-%{release}
+
+%description config-localsave
+Config for reporter to local directory
+
+%if 0%{?fedora}
 %package config-bugzilla-redhat-com
 Summary:        Config for reporter to bugzilla.redhat.com
 Group:          System Environment/Libraries
-
 Requires: report-plugin-bugzilla = %{version}-%{release}
-%if 0%{?fedora}
 Provides: report-config-default = %{version}-%{release}
-%endif
 
 %description config-bugzilla-redhat-com
 Config for reporter to bugzilla.redhat.com
+%endif
 
-
-
+%if 0%{?rhel}
 %package config-RHEL
 Summary:        Config for reporter to RHEL
 Group:          System Environment/Libraries
-
 Requires: report-plugin-RHEL = %{version}-%{release}
-%if 0%{?rhel}
 Provides: report-config-default = %{version}-%{release}
-%endif
 
 %description config-RHEL
 Config for reporter to RHEL
-
-
-
-
+%endif
 
 %prep
 %setup -q
@@ -122,12 +160,18 @@ make %{?_smp_mflags}
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
 
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
+%if 0%{?fedora}
+rm $RPM_BUILD_ROOT%{_sysconfdir}/report.d/RHEL.ini
+rm -rf $RPM_BUILD_ROOT%{python_sitelib}/report/templates/RHEL-template
+%endif
 
+%if 0%{?rhel}
+rm $RPM_BUILD_ROOT%{_sysconfdir}/report.d/bugzilla.redhat.com.ini
+rm -rf $RPM_BUILD_ROOT%{python_sitelib}/report/templates/bugzilla-template
+%endif
 
+%clean
+rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
@@ -138,16 +182,25 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{python_sitelib}/report/io
 %{python_sitelib}/report/io/__init__.py*
 %{python_sitelib}/report/io/TextIO.py*
-%dir %{python_sitelib}/report/alternatives
-%{python_sitelib}/report/alternatives/__init__.py*
-%{python_sitelib}/report/alternatives/scp.py*
-%{python_sitelib}/report/alternatives/localsave.py*
 %dir %{python_sitelib}/report/templates
 %{python_sitelib}/report/templates/__init__.py*
 %dir %{_sysconfdir}/report.d
-%{_bindir}/report-sendfile
-%{_bindir}/report-sendfile-unload-receipt
-%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/report-sendfile.conf
+%{_bindir}/report
+#%{_bindir}/report-sendfile-unload-receipt
+%{_mandir}/man1/report.1.gz
+%{_mandir}/man5/report.conf.5.gz
+%attr(0644,root,root) %config(noreplace) %{_sysconfdir}/report.conf
+
+%{_bindir}/py_strata_client
+%{_includedir}/strata_client.h
+%{_libdir}/libstrata_client.a
+%{_libdir}/libstrata_client.la
+%{_libdir}/libstrata_client.so
+%{_libdir}/libstrata_client.so.0
+%{_libdir}/libstrata_client.so.0.0.0
+%{python_sitelib}/report/templates/strata-template
+%config(noreplace) %{_sysconfdir}/report.d/gss-strata.ini
+
 
 %files gtk
 %defattr(-,root,root,-)
@@ -157,29 +210,84 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root,-)
 %{python_sitelib}/report/io/NewtIO.py*
 
+%if 0%{?fedora}
 %files plugin-bugzilla
 %defattr(-,root,root,-)
 %{python_sitelib}/report/templates/bugzilla-template
+%endif
 
+%files plugin-ftp
+%defattr(-,root,root,-)
+%{python_sitelib}/report/templates/ftp-template
+
+%files plugin-scp
+%defattr(-,root,root,-)
+%{python_sitelib}/report/templates/scp-template
+
+%files plugin-localsave
+%defattr(-,root,root,-)
+%{python_sitelib}/report/templates/localsave-template
+
+%if 0%{?rhel}
 %files plugin-RHEL
 %defattr(-,root,root,-)
 %{python_sitelib}/report/templates/RHEL-template
+%endif
 
+%if 0%{?fedora}
 %files config-bugzilla-redhat-com
 %defattr(-,root,root,-)
 %config(noreplace) %{_sysconfdir}/report.d/bugzilla.redhat.com.ini
+%endif
 
+%if 0%{?rhel}
 %files config-RHEL
 %defattr(-,root,root,-)
 %config(noreplace) %{_sysconfdir}/report.d/RHEL.ini
+%endif
 
+%files config-ftp
+%defattr(-,root,root,-)
+%config(noreplace) %{_sysconfdir}/report.d/dropbox.redhat.com.ini
 
+%files config-scp
+%defattr(-,root,root,-)
+%config(noreplace) %{_sysconfdir}/report.d/scp.ini
 
-
-
+%files config-localsave
+%defattr(-,root,root,-)
+%config(noreplace) %{_sysconfdir}/report.d/localsave.ini
 
 
 %changelog
+* Tue Mar 23 2010 Gavin Romig-Koch 0.9-1
+Resolves: rhbz#562655
+- Update to new version in prep for release
+
+* Fri Mar 19 2010 Adam Stokes <ajs at redhat.com> 0.8-5
+- report.conf manpage
+- report manpage
+- do not traceback on empty login
+- ask for existing strata case
+- setting of config options overrides previous parameter
+  if defined.
+
+* Tue Mar 16 2010 Gavin Romig-Koch <gavin at redhat.com> 0.8-4
+- add Strata client
+- add serialize to report/signature file and read from report/signature file
+
+* Wed Mar 11 2010 Adam Stokes <ajs at redhat.com> 0.8-3
+- wrapper function to print to syslog and display io
+- build plugins/configs based on distro
+- makefile targets for el5.x86/x86_64 el6.x86/x86_64
+- copyright addition to bin
+- updated createfilesignature to accept binary bool
+
+* Tue Mar 02 2010 Adam Stokes <ajs at redhat.com> 0.8-2
+- move all alternatives into templates
+- templates accepts overrides from cmdline
+- new template ftp
+
 * Thu Feb 11 2010 Gavin Romig-Koch <gavin at redhat.com> 0.8-1
 - upgrade to 0.8
 - add examples/IOtest.py
@@ -187,6 +295,9 @@ rm -rf $RPM_BUILD_ROOT
 - have all GTK dialogs open in the center of the screen
 - consistantly return True/False/None from io.functions and report
 - add Provides: report-config-default
+- minor improvements to makefile
+- replace autogen.sh with a better makefiles system
+- improved error message when scp plugin fails
 
 * Thu Jan 28 2010 Gavin Romig-Koch <gavin at redhat.com> 0.7-1
 - upgrade to 0.7


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/report/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- sources	11 Feb 2010 19:09:42 -0000	1.6
+++ sources	23 Mar 2010 21:36:59 -0000	1.7
@@ -1 +1 @@
-09c6e4afa011060a0a2bec8cd1a62bad  report-0.8.tar.gz
+062fbe38e9e3686ede5b5e97df5a64ad  report-0.9.tar.gz