rpms/report/devel .cvsignore, 1.12, 1.13 report.spec, 1.11, 1.12 sources, 1.12, 1.13
Gavin Romig-Koch
gavin at fedoraproject.org
Sun Jun 20 04:00:40 UTC 2010
Author: gavin
Update of /cvs/pkgs/rpms/report/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv25699
Modified Files:
.cvsignore report.spec sources
Log Message:
Resolves: rhbz#594890
Resolves: rhbz#594895
Resolves: rhbz#594863
Resolves: rhbz#594899
Resolves: rhbz#595854
* Sat Jun 19 2010 Gavin Romig-Koch <gavin at redhat.com> 0.16-1
- Insure correct PRODUCT and VERSION used in the Bugzilla and Strata plugins
under Anaconda (RHEL 586147)
- Prepare for the switch from RHEL-bugzilla to Strata (RHEL 567972 partial)
- allow canceling out of input with ctrl-D (RHEL 604030)
- pretty up Newt IO a bit (RHEL 603067)
- clean up documentation a bit (RHEL 604045)
- remove the unused 'username' command line and configuration option.
(RHEL 604195)
- fix the worst of the problems with the ftp plugin (RHEL 604782)(RHEL 604780)
- Need to add -DFORTIFY_SOURCE=2 (RHEL 599342)
- fix command line crash on empty or non-existant input file
(RHEL 594892)(Fedora 594890)
with help from Adam Stokes <astokes at redhat.com>
- make target buttons list vertically, improve 'Query' titles
(RHEL 594897)(Fedora 594895)
- change the config file parser to make config names case sensitive
(Fedora 594863)(RHEL 594865)
from Adam Stokes <astokes at redhat.com>
- change "localsave" button to "local" (Fedora 594899)(RHEL 594901)
from Adam Stokes <astokes at redhat.com>
- fix bug in localsave to /tmp (Fedora 595854)(RHEL 595855)
from Adam Stokes <astokes at redhat.com>
- Strata client now handles 305 redirects (RHEL 591907)
- Add po/ru.po to the list of PO files
- fix so that we continue to build on RHEL/EPEL-5: old libcurl version
- l10n: Updates to Ukrainian (uk) translation
from yurchor <yurchor at fedoraproject.org> -
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/report/devel/.cvsignore,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- .cvsignore 19 May 2010 21:48:16 -0000 1.12
+++ .cvsignore 20 Jun 2010 04:00:35 -0000 1.13
@@ -1 +1 @@
-report-0.14.tar.gz
+report-0.16.tar.gz
Index: report.spec
===================================================================
RCS file: /cvs/pkgs/rpms/report/devel/report.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -p -r1.11 -r1.12
--- report.spec 19 May 2010 21:48:16 -0000 1.11
+++ report.spec 20 Jun 2010 04:00:35 -0000 1.12
@@ -1,10 +1,83 @@
+#
+# The following is to make it easier to build/test alternate build
+# configurations. The build_as_for... flags make it easy to try
+# some predefined configurations. No flag gets changed if it is already
+# set, so that you can set flags at the command line and they won't
+# be changed by the following.
+#
+# 'bugzilla' = include some bugzilla configuration
+# 'bugzilla_rhel' = include the RHEL bugzilla plugin and configuration
+# ELSE include the normal one. This is ignored if 'bugzilla' not set
+# 'strata' = include the strata plugin and RHEL configuration
+# 'strata_test' = include the strata test configuration (ignored if !strata)
+# 'obsolete_old_RHEL' = mark some particular older RHEL plugins as
+# obsolete, so they are removed during update
+# This flag and the obsoletes it protects can go away when this
+# is no longer an issue.
+#
+
%if 0%{?rhel}
-%define rhel_plugin 1
+%define build_as_for_rhel 1
+%endif
+
+%if 0%{?build_as_for_rhel}
+%if "%{?build_as_for_rhel_production}" == ""
+%if "%{?build_as_for_rhel_test}" == ""
+%define build_as_for_rhel_test 1
+%endif
+%endif
+%endif
+
+%if 0%{?build_as_for_rhel_production}
+%if "%{?bugzilla}" == ""
+%define bugzilla 0
+%endif
+%if "%{?bugzilla_rhel}" == ""
+%define bugzilla_rhel 0
+%endif
+%if "%{?strata}" == ""
+%define strata 1
+%endif
+%if "%{?strata_test}" == ""
+%define strata_test 0
+%endif
+%if "%{?obsolete_old_RHEL}" == ""
+%define obsolete_old_RHEL 1
+%endif
+
+%else
+%if 0%{?build_as_for_rhel_test}
+%if "%{?bugzilla}" == ""
+%define bugzilla 1
+%endif
+%if "%{?bugzilla_rhel}" == ""
+%define bugzilla_rhel 1
+%endif
+%if "%{?strata}" == ""
+%define strata 0
+%endif
+%if "%{?strata_test}" == ""
+%define strata_test 0
+%endif
+%if "%{?obsolete_old_RHEL}" == ""
+%define obsolete_old_RHEL 1
+%endif
+
+%else
+# then for everything else
+%if "%{?bugzilla}" == ""
+%define bugzilla 1
+%endif
+%if "%{?obsolete_old_RHEL}" == ""
+%define obsolete_old_RHEL 0
+%endif
+
+%endif
%endif
Name: report
-Version: 0.14
+Version: 0.16
Release: 1%{?dist}
Summary: Incident reporting library
@@ -30,7 +103,29 @@ BuildRequires: libcurl-devel
Requires: openssl report-config-scp report-config-localsave
Requires: libcurl
Requires: libxml2
+
+%if ! 0%{?bugzilla}
+Provides: report-config-default
+%else
Requires: report-config-default
+%endif
+
+%if 0%{?obsolete_old_RHEL}
+%if ! 0%{?bugzilla}
+Obsoletes: report-plugin-RHEL < %{version}
+Obsoletes: report-config-RHEL < %{version}
+Obsoletes: report-plugin-RHEL-bugzilla < %{version}
+Obsoletes: report-config-RHEL-bugzilla-redhat-com < %{version}
+%else
+%if ! 0%{?bugzilla_rhel}
+Obsoletes: report-plugin-RHEL-bugzilla < %{version}
+Obsoletes: report-config-RHEL-bugzilla-redhat-com < %{version}
+%endif
+%endif
+%endif
+
+
+
%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())")}
@@ -64,13 +159,17 @@ Requires: report = %{version}-%{release}
%description newt
Provides Newt IO dialogs for the reporting library
-%if 0%{?rhel_plugin}
+%if 0%{?bugzilla}
+%if 0%{?bugzilla_rhel}
%package plugin-RHEL-bugzilla
Summary: Plugin template reporter to RHEL
Group: System Environment/Libraries
Requires: report = %{version}-%{release}
Requires: rpm-python
+%if 0%{?obsolete_old_RHEL}
+Obsoletes: report-plugin-RHEL
+%endif
%description plugin-RHEL-bugzilla
Plugin template reporter to bugzilla within RHEL
@@ -87,6 +186,7 @@ Requires: python-bugzilla
%description plugin-bugzilla
Plugin template reporter to bugzilla
%endif
+%endif
%package plugin-ftp
Summary: Plugin template reporter to ftp
@@ -137,12 +237,16 @@ Requires: report-plugin-localsave = %{ve
%description config-localsave
Config for reporter to local directory
-%if 0%{?rhel_plugin}
+%if 0%{?bugzilla}
+%if 0%{?bugzilla_rhel}
%package config-RHEL-bugzilla-redhat-com
Summary: Config for reporter to bugzilla.redhat.com within RHEL
Group: System Environment/Libraries
Requires: report-plugin-RHEL-bugzilla = %{version}-%{release}
Provides: report-config-default = %{version}-%{release}
+%if 0%{?obsolete_old_RHEL}
+Obsoletes: report-config-RHEL
+%endif
%description config-RHEL-bugzilla-redhat-com
Config for reporter to bugzilla.redhat.com within RHEL
@@ -157,6 +261,7 @@ Provides: report-config-default = %{vers
%description config-bugzilla-redhat-com
Config for reporter to bugzilla.redhat.com
%endif
+%endif
%prep
%setup -q
@@ -170,19 +275,30 @@ rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
%find_lang %{name}
-%if 0%{?rhel_plugin}
+%if 0%{?bugzilla}
+%if ! 0%{?bugzilla_rhel}
+rm $RPM_BUILD_ROOT%{_sysconfdir}/report.d/RHEL-bugzilla.redhat.com.conf
+rm -rf $RPM_BUILD_ROOT%{python_sitearch}/report/plugins/RHEL-bugzilla
+%else
rm $RPM_BUILD_ROOT%{_sysconfdir}/report.d/bugzilla.redhat.com.conf
rm -rf $RPM_BUILD_ROOT%{python_sitearch}/report/plugins/bugzilla
+%endif
%else
rm $RPM_BUILD_ROOT%{_sysconfdir}/report.d/RHEL-bugzilla.redhat.com.conf
rm -rf $RPM_BUILD_ROOT%{python_sitearch}/report/plugins/RHEL-bugzilla
+rm $RPM_BUILD_ROOT%{_sysconfdir}/report.d/bugzilla.redhat.com.conf
+rm -rf $RPM_BUILD_ROOT%{python_sitearch}/report/plugins/bugzilla
%endif
-%if ! 0%{?py_strata_client}
-rm -rf $RPM_BUILD_ROOT%{_bindir}/py_strata_client
+%if ! 0%{?strata}
+rm -rf $RPM_BUILD_ROOT%{_bindir}/strata
rm -rf $RPM_BUILD_ROOT%{python_sitearch}/report/plugins/strata
-rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/report.d/RHEL-strata.conf
+rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/report.d/RHEL.conf
%endif
+%if ! 0%{?strata_test}
+rm -rf $RPM_BUILD_ROOT%{_sysconfdir}/report.d/strata-test.conf
+%endif
+
mkdir -p $RPM_BUILD_ROOT/var/%{name}
@@ -197,6 +313,7 @@ rm -rf $RPM_BUILD_ROOT
%dir %{python_sitearch}/report
%{python_sitearch}/report/__init__.py*
%{python_sitearch}/report/accountmanager.py*
+%{python_sitearch}/report/release_information.py*
%dir %{python_sitearch}/report/io
%{python_sitearch}/report/io/__init__.py*
%{python_sitearch}/report/io/TextIO.py*
@@ -215,10 +332,12 @@ 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
+%if 0%{?strata}
%{python_sitearch}/report/plugins/strata
-%config(noreplace) %{_sysconfdir}/report.d/RHEL-strata.conf
+%config(noreplace) %{_sysconfdir}/report.d/RHEL.conf
+%if 0%{?strata_test}
+%config(noreplace) %{_sysconfdir}/report.d/strata-test.conf
+%endif
%endif
%files gtk
@@ -241,7 +360,8 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-,root,root,-)
%{python_sitearch}/report/plugins/localsave
-%if 0%{?rhel_plugin}
+%if 0%{?bugzilla}
+%if 0%{?bugzilla_rhel}
%files plugin-RHEL-bugzilla
%defattr(-,root,root,-)
%{python_sitearch}/report/plugins/RHEL-bugzilla
@@ -251,10 +371,11 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-,root,root,-)
%{python_sitearch}/report/plugins/bugzilla
%endif
+%endif
%files config-ftp
%defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/report.d/dropbox.redhat.com.conf
+%config(noreplace) %{_sysconfdir}/report.d/ftp.conf
%files config-scp
%defattr(-,root,root,-)
@@ -264,7 +385,8 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-,root,root,-)
%config(noreplace) %{_sysconfdir}/report.d/localsave.conf
-%if 0%{?rhel_plugin}
+%if 0%{?bugzilla}
+%if 0%{?bugzilla_rhel}
%files config-RHEL-bugzilla-redhat-com
%defattr(-,root,root,-)
%config(noreplace) %{_sysconfdir}/report.d/RHEL-bugzilla.redhat.com.conf
@@ -274,9 +396,43 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-,root,root,-)
%config(noreplace) %{_sysconfdir}/report.d/bugzilla.redhat.com.conf
%endif
+%endif
%changelog
+* Sat Jun 19 2010 Gavin Romig-Koch <gavin at redhat.com> 0.16-1
+- Insure correct PRODUCT and VERSION used in the Bugzilla and Strata plugins
+ under Anaconda (RHEL 586147)
+- Prepare for the switch from RHEL-bugzilla to Strata (RHEL 567972 partial)
+- allow canceling out of input with ctrl-D (RHEL 604030)
+- pretty up Newt IO a bit (RHEL 603067)
+- clean up documentation a bit (RHEL 604045)
+- remove the unused 'username' command line and configuration option.
+ (RHEL 604195)
+- fix the worst of the problems with the ftp plugin (RHEL 604782)(RHEL 604780)
+- Need to add -DFORTIFY_SOURCE=2 (RHEL 599342)
+- fix command line crash on empty or non-existant input file
+ (RHEL 594892)(Fedora 594890)
+ with help from Adam Stokes <astokes at redhat.com>
+- make target buttons list vertically, improve 'Query' titles
+ (RHEL 594897)(Fedora 594895)
+- change the config file parser to make config names case sensitive
+ (Fedora 594863)(RHEL 594865)
+ from Adam Stokes <astokes at redhat.com>
+- change "localsave" button to "local" (Fedora 594899)(RHEL 594901)
+ from Adam Stokes <astokes at redhat.com>
+- fix bug in localsave to /tmp (Fedora 595854)(RHEL 595855)
+ from Adam Stokes <astokes at redhat.com>
+- Strata client now handles 305 redirects (RHEL 591907)
+- Add po/ru.po to the list of PO files
+- fix so that we continue to build on RHEL/EPEL-5: old libcurl version
+- l10n: Updates to Ukrainian (uk) translation
+ from yurchor <yurchor at fedoraproject.org> -
+
+* Thu May 20 2010 Gavin Romig-Koch <gavin at redhat.com> 0.15-1
+- Update version after release
+- fixed: subpackage name change causes dependency failures (RHEL 594047)
+
* Wed May 19 2010 Gavin Romig-Koch <gavin at redhat.com> 0.14-1
- Improvements to the strata client testing scripts
- Corrections to prevent crashes when no user i/o is available (RHEL 589714)
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/report/devel/sources,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -p -r1.12 -r1.13
--- sources 19 May 2010 21:48:16 -0000 1.12
+++ sources 20 Jun 2010 04:00:35 -0000 1.13
@@ -1 +1 @@
-bfefd2eb2e5a1e8c05d13eeb9cfa1380 report-0.14.tar.gz
+453087ab50be1eeb96964545026ffbff report-0.16.tar.gz
More information about the scm-commits
mailing list