packages: abrt/abrt-rpm.patch, abrt/abrt.spec, abrt/rpmkey-pld.patch - up t...

glen glen at pld-linux.org
Thu Apr 8 21:55:49 CEST 2010 

Author: glen                         Date: Thu Apr  8 19:55:49 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 1.0.8, partial rpm patch update

---- Files affected:
packages/abrt:
   abrt-rpm.patch (1.2 -> 1.3) , abrt.spec (1.17 -> 1.18) , rpmkey-pld.patch (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: packages/abrt/abrt-rpm.patch
diff -u packages/abrt/abrt-rpm.patch:1.2 packages/abrt/abrt-rpm.patch:1.3
--- packages/abrt/abrt-rpm.patch:1.2	Mon Mar 15 00:02:41 2010
+++ packages/abrt/abrt-rpm.patch	Thu Apr  8 21:55:44 2010
@@ -8,8 +8,8 @@
      -DBIN_DIR=\"$(bindir)\" \
      -DVAR_RUN=\"$(VAR_RUN)\" \
      -DCONF_DIR=\"$(CONF_DIR)\" \
---- abrt-1.0.7/src/Daemon/RPM.cpp~	2010-02-08 21:22:13.000000000 +0200
-+++ abrt-1.0.7/src/Daemon/RPM.cpp	2010-03-15 00:26:28.929435334 +0200
+--- abrt-1.0.7/src/Daemon/RPM.cpp	2010-03-15 00:26:28.929435334 +0200
++++ abrt-1.0.8/src/Daemon/RPM.cpp	2010-03-24 13:03:13.691485654 +0200
 @@ -33,9 +33,11 @@
  
  void CRPM::LoadOpenGPGPublicKey(const char* pFileName)
@@ -51,7 +51,7 @@
      rpmts ts = rpmtsCreate();
      rpmdbMatchIterator iter = rpmtsInitIterator(ts, RPMTAG_NAME, pPackage, 0);
      Header header = rpmdbNextIterator(iter);
-@@ -128,11 +134,13 @@
+@@ -128,23 +134,25 @@
      rpmdbFreeIterator(iter);
      rpmtsFree(ts);
      return ret;
@@ -62,17 +62,29 @@
  {
 -    std::string pDescription;
 +    std::string pDescription = "";
-+#if 0
++
      rpmts ts = rpmtsCreate();
      rpmdbMatchIterator iter = rpmtsInitIterator(ts, RPMTAG_NAME, pPackage, 0);
      Header header = rpmdbNextIterator(iter);
-@@ -148,12 +156,14 @@
+     if (header != NULL)
+     {
+-        rpmtd td = rpmtdNew();
+-        headerGet(header, RPMTAG_SUMMARY, td, HEADERGET_DEFAULT);
+-        const char* summary = rpmtdGetString(td);
+-        headerGet(header, RPMTAG_DESCRIPTION, td, HEADERGET_DEFAULT);
+-        const char* description = rpmtdGetString(td);
++        const char *summary, *description;
++        int_32 type, count;
++
++        headerGetEntry(header, RPMTAG_SUMMARY, &type, (void**)&summary, &count);
++        headerGetEntry(header, RPMTAG_DESCRIPTION, &type, (void**)&description, &count);
++
+         pDescription = summary + std::string("\n\n") + description;
+-        rpmtdFree(td);
      }
      rpmdbFreeIterator(iter);
      rpmtsFree(ts);
-+#endif
-     return pDescription;
- }
+@@ -153,7 +161,8 @@
  
  std::string GetComponent(const char* pFileName)
  {
@@ -82,7 +94,7 @@
      rpmts ts = rpmtsCreate();
      rpmdbMatchIterator iter = rpmtsInitIterator(ts, RPMTAG_BASENAMES, pFileName, 0);
      Header header = rpmdbNextIterator(iter);
-@@ -172,12 +182,14 @@
+@@ -172,12 +181,14 @@
  
      rpmdbFreeIterator(iter);
      rpmtsFree(ts);
@@ -97,8 +109,7 @@
      rpmts ts = rpmtsCreate();
      rpmdbMatchIterator iter = rpmtsInitIterator(ts, RPMTAG_BASENAMES, pFileName, 0);
      Header header = rpmdbNextIterator(iter);
-@@ -188,5 +200,6 @@
- 
+@@ -189,4 +200,5 @@
      rpmdbFreeIterator(iter);
      rpmtsFree(ts);
 +#endif

================================================================
Index: packages/abrt/abrt.spec
diff -u packages/abrt/abrt.spec:1.17 packages/abrt/abrt.spec:1.18
--- packages/abrt/abrt.spec:1.17	Tue Apr  6 23:21:52 2010
+++ packages/abrt/abrt.spec	Thu Apr  8 21:55:44 2010
@@ -3,13 +3,13 @@
 # - fixes to get working with jbj rpm
 Summary:	Automatic bug detection and reporting tool
 Name:		abrt
-Version:	1.0.7
-Release:	0.7
+Version:	1.0.8
+Release:	0.8
 License:	GPL v2+
 Group:		Applications/System
 URL:		https://fedorahosted.org/abrt/
-Source0:	http://jmoskovc.fedorapeople.org/%{name}-%{version}.tar.gz
-# Source0-md5:	edb93af31b1bc7b5653ccbf7bb6b4dce
+Source0:	https://fedorahosted.org/released/abrt/%{name}-%{version}.tar.gz
+# Source0-md5:	0e480999bb77b3babe19373c03057df4
 Source1:	%{name}.init
 Patch0:		%{name}-rpm.patch
 Patch1:		%{name}-pld.patch
@@ -36,6 +36,7 @@
 BuildRequires:	rpm-pythonprov
 BuildRequires:	rpmbuild(macros) >= 1.219
 BuildRequires:	sqlite3-devel
+BuildRequires:	xmlrpc-c-client
 BuildRequires:	xmlrpc-c-devel >= 1.20.3-1
 BuildRequires:	zlib-devel
 Requires(postun):	/usr/sbin/groupdel
@@ -211,8 +212,7 @@
 Requires:	%{name}-addon-python
 # reporters
 Requires:	%{name}-plugin-logger
-Requires:	%{name}-plugin-sosreport
-Requires:	%{name}-plugin-ticketuploader
+Requires:	%{name}-plugin-runapp
 
 %description cli
 This package contains simple command line client for controling abrt
@@ -233,8 +233,7 @@
 # Default config of addon-ccpp requires gdb
 Requires:	%{name}-gui
 Requires:	%{name}-plugin-logger
-Requires:	%{name}-plugin-sosreport
-Requires:	%{name}-plugin-ticketuploader
+Requires:	%{name}-plugin-runapp
 Requires:	gdb >= 7.0-3
 Provides:	bug-buddy
 Obsoletes:	bug-buddy
@@ -370,7 +369,10 @@
 %attr(755,root,root) %{_bindir}/dumpoops
 %attr(755,root,root) %{_libdir}/%{name}/libKerneloops.so
 %attr(755,root,root) %{_libdir}/%{name}/libKerneloopsScanner.so
+%attr(755,root,root) %{_libdir}/%{name}/libKerneloopsReporter.so
+%{_libdir}/%{name}/KerneloopsReporter.GTKBuilder
 %{_mandir}/man7/%{name}-KerneloopsScanner.7*
+%{_mandir}/man7/%{name}-KerneloopsReporter.7*
 
 %files plugin-logger
 %defattr(644,root,root,755)
@@ -445,6 +447,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.18  2010/04/08 19:55:44  glen
+- up to 1.0.8, partial rpm patch update
+
 Revision 1.17  2010/04/06 21:21:52  sparky
 - BR: bison
 - dropped BR: nss-devel

================================================================
Index: packages/abrt/rpmkey-pld.patch
diff -u packages/abrt/rpmkey-pld.patch:1.2 packages/abrt/rpmkey-pld.patch:1.3
--- packages/abrt/rpmkey-pld.patch:1.2	Mon Mar 15 00:02:41 2010
+++ packages/abrt/rpmkey-pld.patch	Thu Apr  8 21:55:44 2010
@@ -1,12 +1,6 @@
---- abrt-1.0.7/src/Daemon/gpg_keys~	2010-02-12 18:31:59.000000000 +0200
-+++ abrt-1.0.7/src/Daemon/gpg_keys	2010-03-15 00:30:17.102537684 +0200
-@@ -1,7 +1,2 @@
--/etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-beta-2
--/etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-auxiliary
--/etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-beta-2
--/etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-legacy-beta
--/etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-legacy-former
--/etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-legacy-release
--/etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-legacy-rhx
+--- abrt-1.0.8/src/Daemon/gpg_keys~	2010-02-12 00:52:28.000000000 +0200
++++ abrt-1.0.8/src/Daemon/gpg_keys	2010-03-24 12:47:24.745636712 +0200
+@@ -1 +1,2 @@
+-/etc/pki/rpm-gpg/RPM-GPG-KEY-fedora
 +/etc/pki/rpm-gpg/PLD-2.0-Ac-GPG-key.asc
 +/etc/pki/rpm-gpg/PLD-3.0-Th-GPG-key.asc
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/abrt/abrt-rpm.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/abrt/abrt.spec?r1=1.17&r2=1.18&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/abrt/rpmkey-pld.patch?r1=1.2&r2=1.3&f=u

More information about the pld-cvs-commit mailing list