rpms/report/devel .cvsignore, 1.7, 1.8 report.spec, 1.6, 1.7 sources, 1.7, 1.8
Gavin Romig-Koch
gavin at fedoraproject.org
Thu Mar 25 21:05:57 UTC 2010
Author: gavin
Update of /cvs/pkgs/rpms/report/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv17314
Modified Files:
.cvsignore report.spec sources
Log Message:
* Thu Mar 25 2010 Gavin Romig-Koch 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)
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/report/devel/.cvsignore,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- .cvsignore 23 Mar 2010 21:36:59 -0000 1.7
+++ .cvsignore 25 Mar 2010 21:05:56 -0000 1.8
@@ -1 +1,2 @@
report-0.9.tar.gz
+report-0.10.tar.gz
Index: report.spec
===================================================================
RCS file: /cvs/pkgs/rpms/report/devel/report.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- report.spec 23 Mar 2010 21:36:59 -0000 1.6
+++ report.spec 25 Mar 2010 21:05:56 -0000 1.7
@@ -1,5 +1,5 @@
Name: report
-Version: 0.9
+Version: 0.10
Release: 1%{?dist}
Summary: Incident reporting library
@@ -24,6 +24,7 @@ BuildRequires: libcurl-devel
Requires: openssl report-config-scp report-config-localsave
Requires: libcurl
Requires: libxml2
+Requires: report-config-default
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
@@ -53,29 +54,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 +127,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 +136,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
@@ -160,16 +159,22 @@ make %{?_smp_mflags}
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
-%if 0%{?fedora}
+%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
+%else
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
+%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
%endif
+
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -186,21 +191,22 @@ rm -rf $RPM_BUILD_ROOT
%{python_sitelib}/report/templates/__init__.py*
%dir %{_sysconfdir}/report.d
%{_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
+
+%if 0%{?py_strata_client}
+%{_bindir}/py_strata_client
%{python_sitelib}/report/templates/strata-template
%config(noreplace) %{_sysconfdir}/report.d/gss-strata.ini
-
+%endif
%files gtk
%defattr(-,root,root,-)
@@ -210,12 +216,6 @@ 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
@@ -232,19 +232,13 @@ rm -rf $RPM_BUILD_ROOT
%files plugin-RHEL
%defattr(-,root,root,-)
%{python_sitelib}/report/templates/RHEL-template
-%endif
-%if 0%{?fedora}
-%files config-bugzilla-redhat-com
+%else
+%files plugin-bugzilla
%defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/report.d/bugzilla.redhat.com.ini
+%{python_sitelib}/report/templates/bugzilla-template
%endif
-%if 0%{?rhel}
-%files config-RHEL
-%defattr(-,root,root,-)
-%config(noreplace) %{_sysconfdir}/report.d/RHEL.ini
-%endif
%files config-ftp
%defattr(-,root,root,-)
@@ -258,8 +252,27 @@ rm -rf $RPM_BUILD_ROOT
%defattr(-,root,root,-)
%config(noreplace) %{_sysconfdir}/report.d/localsave.ini
+%if 0%{?rhel}
+%files config-RHEL
+%defattr(-,root,root,-)
+%config(noreplace) %{_sysconfdir}/report.d/RHEL.ini
+
+%else
+%files config-bugzilla-redhat-com
+%defattr(-,root,root,-)
+%config(noreplace) %{_sysconfdir}/report.d/bugzilla.redhat.com.ini
+%endif
+
%changelog
+* Thu Mar 25 2010 Gavin Romig-Koch 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)
+
* Tue Mar 23 2010 Gavin Romig-Koch 0.9-1
Resolves: rhbz#562655
- Update to new version in prep for release
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/report/devel/sources,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -p -r1.7 -r1.8
--- sources 23 Mar 2010 21:36:59 -0000 1.7
+++ sources 25 Mar 2010 21:05:57 -0000 1.8
@@ -1 +1,2 @@
062fbe38e9e3686ede5b5e97df5a64ad report-0.9.tar.gz
+816d8ddddc5a8e8e7a4aebbca68baccc report-0.10.tar.gz
More information about the scm-commits
mailing list