rpms/report/F-11 .cvsignore, 1.4, 1.5 report.spec, 1.4, 1.5 sources, 1.4, 1.5
Gavin Romig-Koch
gavin at fedoraproject.org
Thu May 6 17:12:09 UTC 2010
Author: gavin
Update of /cvs/pkgs/rpms/report/F-11
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv32576
Modified Files:
.cvsignore report.spec sources
Log Message:
Resolves: bz575819
Resolves: bz573037
- many minor changes to keep up with strata server
including set the 'Accepted-Language:' header in the strata client
(Fedora BZ 575819)
- initial Polish translation
from raven <raven at fedoraproject.org>
- fix python config in spec file and makefiles so that both x86
and x86_64 arches can be installed at the same time. (RHEL BZ 586971)
- corrects the password remembering/forgetting code for bugzilla.redhat.com
and sealert (RHEL BZ 576632)
- Spanish translation
from logan <logan at fedoraproject.org>
- Ukrainian (uk) translation
from yurchor <yurchor at fedoraproject.org>
- deal gracefully with non-openable/readable files in
NamedFileSignatureValues (Fedora BZ 573037)
- minor makefile and spec file changes:
upgrade version
change RHEL-6-build to RHEL-6-candidate
add more mock makefile rules for more configurations
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/report/F-11/.cvsignore,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- .cvsignore 11 Feb 2010 19:20:36 -0000 1.4
+++ .cvsignore 6 May 2010 17:12:09 -0000 1.5
@@ -1 +1 @@
-report-0.8.tar.gz
+report-0.11.tar.gz
Index: report.spec
===================================================================
RCS file: /cvs/pkgs/rpms/report/F-11/report.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- report.spec 24 Mar 2010 21:14:50 -0000 1.4
+++ report.spec 6 May 2010 17:12:09 -0000 1.5
@@ -1,5 +1,5 @@
Name: report
-Version: 0.9
+Version: 0.11
Release: 1%{?dist}
Summary: Incident reporting library
@@ -15,6 +15,7 @@ Provides: report-devel = %{version}-%{re
BuildRequires: python-devel
BuildRequires: openssl-devel
BuildRequires: libxml2-devel
+BuildRequires: gettext
%if 0%{?rhel} && 0%{?rhel} <= 5
BuildRequires: curl-devel
%else
@@ -24,9 +25,13 @@ BuildRequires: libcurl-devel
Requires: openssl report-config-scp report-config-localsave
Requires: libcurl
Requires: libxml2
+Requires: report-config-default
-
+%if ! (0%{?fedora} > 12 || 0%{?rhel} > 5)
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
+%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
+%endif
+
%description
A generic problem/bug/incident/error reporting library, that can be
@@ -53,29 +58,28 @@ 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
+%if 0%{?rhel}
+%package plugin-RHEL
+Summary: Plugin template reporter to RHEL
Group: System Environment/Libraries
Requires: report = %{version}-%{release}
Requires: rpm-python
-Requires: python-bugzilla
-%description plugin-bugzilla
-Plugin template reporter to bugzilla
-%endif
+%description plugin-RHEL
+Plugin template reporter to RHEL
-%if 0%{?rhel}
-%package plugin-RHEL
-Summary: Plugin template reporter to RHEL
+%else
+%package plugin-bugzilla
+Summary: Plugin template reporter to bugzilla
Group: System Environment/Libraries
Requires: report = %{version}-%{release}
Requires: rpm-python
+Requires: python-bugzilla
-%description plugin-RHEL
-Plugin template reporter to RHEL
+%description plugin-bugzilla
+Plugin template reporter to bugzilla
%endif
%package plugin-ftp
@@ -127,17 +131,6 @@ Requires: report-plugin-localsave = %{ve
%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}
-Provides: report-config-default = %{version}-%{release}
-
-%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
@@ -147,6 +140,16 @@ Provides: report-config-default = %{vers
%description config-RHEL
Config for reporter to RHEL
+
+%else
+%package config-bugzilla-redhat-com
+Summary: Config for reporter to bugzilla.redhat.com
+Group: System Environment/Libraries
+Requires: report-plugin-bugzilla = %{version}-%{release}
+Provides: report-config-default = %{version}-%{release}
+
+%description config-bugzilla-redhat-com
+Config for reporter to bugzilla.redhat.com
%endif
%prep
@@ -159,109 +162,159 @@ make %{?_smp_mflags}
%install
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
+%find_lang %{name}
-%if 0%{?fedora}
-rm $RPM_BUILD_ROOT%{_sysconfdir}/report.d/RHEL.ini
-rm -rf $RPM_BUILD_ROOT%{python_sitelib}/report/templates/RHEL-template
+%if 0%{?rhel}
+rm $RPM_BUILD_ROOT%{_sysconfdir}/report.d/bugzilla.redhat.com.conf
+rm -rf $RPM_BUILD_ROOT%{python_sitearch}/report/plugins/bugzilla
+%else
+rm $RPM_BUILD_ROOT%{_sysconfdir}/report.d/RHEL.conf
+rm -rf $RPM_BUILD_ROOT%{python_sitearch}/report/plugins/RHEL
%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
+%if ! 0%{?py_strata_client}
+rm -rf $RPM_BUILD_ROOT%{_bindir}/py_strata_client
+rm -rf $RPM_BUILD_ROOT%{python_sitearch}/report/plugins/strata
+rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/report.d/gss-strata.conf
%endif
+mkdir -p $RPM_BUILD_ROOT/var/%{name}
+
+
+
%clean
rm -rf $RPM_BUILD_ROOT
-%files
+%files -f %{name}.lang
%defattr(-,root,root,-)
%doc README LICENCE
-%dir %{python_sitelib}/report
-%{python_sitelib}/report/__init__.py*
-%{python_sitelib}/report/accountmanager.py*
-%dir %{python_sitelib}/report/io
-%{python_sitelib}/report/io/__init__.py*
-%{python_sitelib}/report/io/TextIO.py*
-%dir %{python_sitelib}/report/templates
-%{python_sitelib}/report/templates/__init__.py*
+%dir %{python_sitearch}/report
+%{python_sitearch}/report/__init__.py*
+%{python_sitearch}/report/accountmanager.py*
+%dir %{python_sitearch}/report/io
+%{python_sitearch}/report/io/__init__.py*
+%{python_sitearch}/report/io/TextIO.py*
+%dir %{python_sitearch}/report/plugins
+%{python_sitearch}/report/plugins/__init__.py*
%dir %{_sysconfdir}/report.d
%{_bindir}/report
-#%{_bindir}/report-sendfile-unload-receipt
%{_mandir}/man1/report.1.gz
%{_mandir}/man5/report.conf.5.gz
+%dir %{_var}/report
%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
-
+%if 0%{?py_strata_client}
+%{_bindir}/py_strata_client
+%{python_sitearch}/report/plugins/strata
+%config(noreplace) %{_sysconfdir}/report.d/gss-strata.conf
+%endif
%files gtk
%defattr(-,root,root,-)
-%{python_sitelib}/report/io/GTKIO.py*
+%{python_sitearch}/report/io/GTKIO.py*
%files newt
%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
+%{python_sitearch}/report/io/NewtIO.py*
%files plugin-ftp
%defattr(-,root,root,-)
-%{python_sitelib}/report/templates/ftp-template
+%{python_sitearch}/report/plugins/ftp
%files plugin-scp
%defattr(-,root,root,-)
-%{python_sitelib}/report/templates/scp-template
+%{python_sitearch}/report/plugins/scp
%files plugin-localsave
%defattr(-,root,root,-)
-%{python_sitelib}/report/templates/localsave-template
+%{python_sitearch}/report/plugins/localsave
%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
+%{python_sitearch}/report/plugins/RHEL
-%if 0%{?rhel}
-%files config-RHEL
+%else
+%files plugin-bugzilla
%defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/report.d/RHEL.ini
+%{python_sitearch}/report/plugins/bugzilla
%endif
%files config-ftp
%defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/report.d/dropbox.redhat.com.ini
+%config(noreplace) %{_sysconfdir}/report.d/dropbox.redhat.com.conf
%files config-scp
%defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/report.d/scp.ini
+%config(noreplace) %{_sysconfdir}/report.d/scp.conf
%files config-localsave
%defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/report.d/localsave.ini
+%config(noreplace) %{_sysconfdir}/report.d/localsave.conf
+
+%if 0%{?rhel}
+%files config-RHEL
+%defattr(-,root,root,-)
+%config(noreplace) %{_sysconfdir}/report.d/RHEL.conf
+
+%else
+%files config-bugzilla-redhat-com
+%defattr(-,root,root,-)
+%config(noreplace) %{_sysconfdir}/report.d/bugzilla.redhat.com.conf
+%endif
%changelog
-* Tue Mar 23 2010 Gavin Romig-Koch 0.9-1
-Resolves: rhbz#562655
+* Thu May 06 2010 Gavin Romig-Koch <gavin at redhat.com> 0.11-1
+- many minor changes to keep up with strata server
+ including set the 'Accepted-Language:' header in the strata client
+ (Fedora BZ 575819)
+- initial Polish translation
+ from raven <raven at fedoraproject.org>
+- fix python config in spec file and makefiles so that both x86
+ and x86_64 arches can be installed at the same time. (RHEL BZ 586971)
+- corrects the password remembering/forgetting code for bugzilla.redhat.com
+ and sealert (RHEL BZ 576632)
+- Spanish translation
+ from logan <logan at fedoraproject.org>
+- Ukrainian (uk) translation
+ from yurchor <yurchor at fedoraproject.org>
+- deal gracefully with non-openable/readable files in
+ NamedFileSignatureValues (Fedora BZ 573037)
+- minor makefile and spec file changes:
+ upgrade version
+ change RHEL-6-build to RHEL-6-candidate
+ add more mock makefile rules for more configurations
+
+* Mon Apr 5 2010 Adam Stokes <ajs at redhat.com> 0.10-5
+- Resolves: bz579045
+
+* Tue Mar 30 2010 Adam Stokes <ajs at redhat.com> 0.10-2
+- Update bz filer to submit correct product/version
+- Complete move from templates to plugins
+
+* Thu Mar 25 2010 Gavin Romig-Koch <gavin at redhat.com> 0.10-1
+- Resolves: rhbz#576927
+- Resolves: rhbz#576926
+- Resolves: rhbz#576997
+- Resolves: rhbz#576995
+- simplify/correct interdependancies among report's sub-packages
+- don't install the strata report plugin (but leave the client library)
+
+* Wed Mar 24 2010 Adam Stokes <ajs at redhat.com> 0.9-2
+- Update translation scheme
+- Renamed ini to conf
+- Renamed templates dir to plugins
+- Defined target/plugins
+
+* Tue Mar 23 2010 Gavin Romig-Koch <gavin at redhat.com> 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
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/report/F-11/sources,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- sources 11 Feb 2010 19:20:36 -0000 1.4
+++ sources 6 May 2010 17:12:09 -0000 1.5
@@ -1 +1 @@
-09c6e4afa011060a0a2bec8cd1a62bad report-0.8.tar.gz
+321edbcc365488c60a3e9ae1a92cff65 report-0.11.tar.gz
More information about the scm-commits
mailing list