rpms/report/F-12 .cvsignore, 1.7, 1.8 report.spec, 1.7, 1.8 sources, 1.8, 1.9

Gavin Romig-Koch gavin at fedoraproject.org
Thu May 6 17:05:53 UTC 2010 

Author: gavin

Update of /cvs/pkgs/rpms/report/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv31731

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-12/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore	24 Mar 2010 18:51:26 -0000	1.7
+++ .cvsignore	6 May 2010 17:05:53 -0000	1.8
@@ -1 +1 @@
-report-0.9.tar.gz
+report-0.11.tar.gz


Index: report.spec
===================================================================
RCS file: /cvs/pkgs/rpms/report/F-12/report.spec,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- report.spec	5 Apr 2010 19:39:33 -0000	1.7
+++ report.spec	6 May 2010 17:05:53 -0000	1.8
@@ -1,6 +1,6 @@
 Name:           report
-Version:        0.10
-Release:        5%{?dist}
+Version:        0.11
+Release:        1%{?dist}
 Summary:        Incident reporting library
 
 Group:          System Environment/Libraries
@@ -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
@@ -26,8 +27,11 @@ 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 
@@ -158,41 +162,45 @@ make %{?_smp_mflags}
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
+%find_lang %{name}
 
 %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
+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.ini
-rm -rf $RPM_BUILD_ROOT%{python_sitelib}/report/templates/RHEL-template
+rm $RPM_BUILD_ROOT%{_sysconfdir}/report.d/RHEL.conf
+rm -rf $RPM_BUILD_ROOT%{python_sitearch}/report/plugins/RHEL
 %endif
 
 %if ! 0%{?py_strata_client}
 rm -rf $RPM_BUILD_ROOT%{_bindir}/py_strata_client
-rm -rf $RPM_BUILD_ROOT%{python_sitelib}/report/templates/strata-template
-rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/report.d/gss-strata.ini
+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
 %{_mandir}/man1/report.1.gz
 %{_mandir}/man5/report.conf.5.gz
+%dir %{_var}/report
 %attr(0644,root,root) %config(noreplace) %{_sysconfdir}/report.conf
 
 %{_includedir}/strata_client.h
@@ -201,75 +209,95 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libstrata_client.so
 %{_libdir}/libstrata_client.so.0
 %{_libdir}/libstrata_client.so.0.0.0
-
 %if 0%{?py_strata_client}
 %{_bindir}/py_strata_client
-%{python_sitelib}/report/templates/strata-template
-%config(noreplace) %{_sysconfdir}/report.d/gss-strata.ini
+%{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*
+%{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
+%{python_sitearch}/report/plugins/RHEL
 
 %else
 %files plugin-bugzilla
 %defattr(-,root,root,-)
-%{python_sitelib}/report/templates/bugzilla-template
+%{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.ini
+%config(noreplace) %{_sysconfdir}/report.d/RHEL.conf
 
 %else
 %files config-bugzilla-redhat-com
 %defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/report.d/bugzilla.redhat.com.ini
+%config(noreplace) %{_sysconfdir}/report.d/bugzilla.redhat.com.conf
 %endif
 
 
 %changelog
+* 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
@@ -279,6 +307,12 @@ rm -rf $RPM_BUILD_ROOT
 - 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


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/report/F-12/sources,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -p -r1.8 -r1.9
--- sources	5 Apr 2010 19:39:34 -0000	1.8
+++ sources	6 May 2010 17:05:53 -0000	1.9
@@ -1 +1 @@
-3ff0266ba51fc60bc018b4d8aef92dff  report-0.10.tar.gz
+321edbcc365488c60a3e9ae1a92cff65  report-0.11.tar.gz

More information about the scm-commits mailing list