Author: glen Date: Mon Dec 7 11:43:30 2009 GMT Module: packages Tag: HEAD ---- Log message: - builds finally - rpm addon crippled (needs porting)
---- Files affected: packages/abrt: abrt.spec (1.4 -> 1.5) , abrt-rpm.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/abrt/abrt.spec diff -u packages/abrt/abrt.spec:1.4 packages/abrt/abrt.spec:1.5 --- packages/abrt/abrt.spec:1.4 Sat Dec 5 23:20:18 2009 +++ packages/abrt/abrt.spec Mon Dec 7 12:43:25 2009 @@ -1,4 +1,6 @@ # $Revision$, $Date$ +# TODO +# - fixes to get working with jbj rpm Summary: Automatic bug detection and reporting tool Name: abrt Version: 1.0.0 @@ -9,6 +11,7 @@ Source0: http://jmoskovc.fedorapeople.org/%{name}-%{version}.tar.gz # Source0-md5: 62a8a6a1d7712472133b97b38469683e Source1: %{name}.init +Patch0: %{name}-rpm.patch BuildRequires: bzip2-devel BuildRequires: curl-devel BuildRequires: dbus-devel @@ -24,11 +27,16 @@ BuildRequires: polkit-devel BuildRequires: python-devel BuildRequires: rpm-devel >= 4.5-28 +BuildRequires: rpmbuild(macros) >= 1.219 BuildRequires: sqlite3-devel BuildRequires: xmlrpc-c-devel >= 1.20.3-1 BuildRequires: zlib-devel +Requires(postun): /sbin/ldconfig +Requires(postun): /usr/sbin/groupdel +Requires(pre): /usr/bin/getgid Requires(pre): /usr/sbin/groupadd Requires: %{name}-libs = %{version}-%{release} +Provides: group(abrt) BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -73,7 +81,7 @@ GTK+ wizard for convenient bug reporting. %package addon-ccpp -Summary: %{name}'s C/C++ addon +Summary: abrt's C/C++ addon Group: Libraries Requires: %{name} = %{version}-%{release} Requires: elfutils @@ -85,7 +93,7 @@ analyzer plugin. %package plugin-firefox -Summary: %{name}'s Firefox analyzer plugin +Summary: abrt's Firefox analyzer plugin Group: Libraries Requires: %{name} = %{version}-%{release} Requires: elfutils @@ -96,7 +104,7 @@ This package contains hook for Firefox %package addon-kerneloops -Summary: %{name}'s kerneloops addon +Summary: abrt's kerneloops addon Group: Libraries Requires: %{name} = %{version}-%{release} Requires: %{name}-plugin-kerneloopsreporter = %{version}-%{release} @@ -108,7 +116,7 @@ collecting. %package plugin-kerneloopsreporter -Summary: %{name}'s kerneloops reporter plugin +Summary: abrt's kerneloops reporter plugin Group: Libraries Requires: %{name} = %{version}-%{release} Requires: curl @@ -119,7 +127,7 @@ server, e.g. kerneloops.org. %package plugin-sqlite3 -Summary: %{name}'s SQLite3 database plugin +Summary: abrt's SQLite3 database plugin Group: Libraries Requires: %{name} = %{version}-%{release} @@ -128,7 +136,7 @@ the data required for creating a bug report. %package plugin-logger -Summary: %{name}'s logger reporter plugin +Summary: abrt's logger reporter plugin Group: Libraries Requires: %{name} = %{version}-%{release} @@ -136,7 +144,7 @@ The simple reporter plugin, which writes a report to a specified file. %package plugin-mailx -Summary: %{name}'s mailx reporter plugin +Summary: abrt's mailx reporter plugin Group: Libraries Requires: %{name} = %{version}-%{release} Requires: mailx @@ -146,7 +154,7 @@ specified email. %package plugin-runapp -Summary: %{name}'s runapp plugin +Summary: abrt's runapp plugin Group: Libraries Requires: %{name} = %{version}-%{release} @@ -154,7 +162,7 @@ Plugin to run external programs. %package plugin-sosreport -Summary: %{name}'s sosreport plugin +Summary: abrt's sosreport plugin Group: Libraries Requires: %{name} = %{version}-%{release} Requires: sos @@ -163,7 +171,7 @@ Plugin to include an sosreport in an abrt report. %package plugin-bugzilla -Summary: %{name}'s bugzilla plugin +Summary: abrt's bugzilla plugin Group: Libraries Requires: %{name} = %{version}-%{release} @@ -171,7 +179,7 @@ Plugin to report bugs into the bugzilla. %package plugin-catcut -Summary: %{name}'s catcut plugin +Summary: abrt's catcut plugin Group: Libraries Requires: %{name} = %{version}-%{release} @@ -179,7 +187,7 @@ Plugin to report bugs into the catcut. %package plugin-ticketuploader -Summary: %{name}'s ticketuploader plugin +Summary: abrt's ticketuploader plugin Group: Libraries Requires: %{name} = %{version}-%{release} @@ -188,7 +196,7 @@ ticketing system. %package plugin-filetransfer -Summary: %{name}'s File Transfer plugin +Summary: abrt's File Transfer plugin Group: Libraries Requires: %{name} = %{version}-%{release} @@ -196,7 +204,7 @@ Plugin to uploading files to a server. %package addon-python -Summary: %{name}'s addon for catching and analyzing Python exceptions +Summary: abrt's addon for catching and analyzing Python exceptions Group: Libraries Requires: %{name} = %{version}-%{release} @@ -205,7 +213,7 @@ hadnling uncaught exception in python programs. %package cli -Summary: %{name}'s command line interface +Summary: abrt's command line interface Group: X11/Applications Requires: %{name} = %{version}-%{release} @@ -231,7 +239,7 @@ %prep %setup -q -#sed -i -e /PKG_CHECK_MODULES.*RPM/s,^,dnl, configure.ac +%patch0 -p1 %build %configure @@ -244,31 +252,33 @@ %{__make} install \ mandir=%{_mandir} \ DESTDIR=$RPM_BUILD_ROOT + %find_lang %{name} +%py_postclean + # remove all .la and .a files find $RPM_BUILD_ROOT -name '*.la' -or -name '*.a' | xargs rm -f -install -d ${RPM_BUILD_ROOT}/%{_initrddir} -install %{SOURCE1} ${RPM_BUILD_ROOT}/%{_initrddir}/abrtd +install -d $RPM_BUILD_ROOT/etc/rc.d/init.d +install %{SOURCE1} $RPM_BUILD_ROOT/etc/rc.d/init.d/abrtd install -d $RPM_BUILD_ROOT/var/cache/%{name} install -d $RPM_BUILD_ROOT/var/cache/%{name}-di install -d $RPM_BUILD_ROOT/var/run/%{name} desktop-file-install \ --dir $RPM_BUILD_ROOT%{_desktopdir} \ - --vendor fedora \ --delete-original \ $RPM_BUILD_ROOT%{_desktopdir}/%{name}.desktop desktop-file-install \ - --dir ${RPM_BUILD_ROOT}%{_sysconfdir}/xdg/autostart \ + --dir $RPM_BUILD_ROOT%{_sysconfdir}/xdg/autostart \ src/Applet/%{name}-applet.desktop %clean rm -rf $RPM_BUILD_ROOT %pre -/usr/sbin/groupadd -f --system abrt +%groupadd -g 182 abrt %post /sbin/chkconfig --add abrtd @@ -281,18 +291,22 @@ fi %post libs -p /sbin/ldconfig -%postun libs -p /sbin/ldconfig + +%postun +/sbin/ldconfig +if [ "$1" = "0" ]; then + %groupremove abrt +fi %files -f %{name}.lang %defattr(644,root,root,755) %doc README COPYING -%attr(755,root,root) %{_sbindir}/%{name}d +%attr(755,root,root) %{_sbindir}/abrtd %attr(755,root,root) %{_bindir}/%{name}-debuginfo-install %config(noreplace) %{_sysconfdir}/%{name}/%{name}.conf %config(noreplace) /etc/dbus-1/system.d/dbus-%{name}.conf -%{_initrddir}/%{name}d -%dir /var/cache/%{name} -%dir %attr(775, root, abrt) /var/cache/%{name} +%attr(754,root,root) /etc/rc.d/init.d/abrtd +%dir %attr(775,root,abrt) /var/cache/%{name} %dir /var/cache/%{name}-di %dir /var/run/%{name} %dir %{_sysconfdir}/%{name} @@ -317,9 +331,9 @@ %defattr(644,root,root,755) %attr(755,root,root) %{_bindir}/%{name}-gui %{_datadir}/%{name} -+%{_desktopdir}/%{name}.desktop -+%{_pixmapsdir}/abrt.png -+%{_iconsdir}/hicolor/48x48/apps/*.png +%{_desktopdir}/%{name}.desktop +%{_pixmapsdir}/abrt.png +%{_iconsdir}/hicolor/48x48/apps/*.png %attr(755,root,root) %{_bindir}/%{name}-applet %{_sysconfdir}/xdg/autostart/%{name}-applet.desktop @@ -389,7 +403,7 @@ %config(noreplace) %{_sysconfdir}/%{name}/plugins/Catcut.conf %attr(755,root,root) %{_libdir}/%{name}/libCatcut.so* %{_libdir}/%{name}/Catcut.GTKBuilder -%{_mandir}/man7/%{name}-Catcut.7* +#%{_mandir}/man7/%{name}-Catcut.7* %files plugin-ticketuploader %defattr(644,root,root,755) @@ -410,7 +424,7 @@ %config(noreplace) %{_sysconfdir}/%{name}/pyhook.conf #%{python_sitearch}/ABRTUtils.so %attr(755,root,root) %{_libdir}/%{name}/libPython.so* -%{python_site}/*.py* +%{py_sitescriptdir}/*.py[co] %files cli %defattr(644,root,root,755) @@ -427,6 +441,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.5 2009/12/07 11:43:25 glen +- builds finally +- rpm addon crippled (needs porting) + Revision 1.4 2009/12/05 22:20:18 glen - rpm and xmlrpc-c with .pc files ================================================================ Index: packages/abrt/abrt-rpm.patch diff -u /dev/null packages/abrt/abrt-rpm.patch:1.1 --- /dev/null Mon Dec 7 12:43:30 2009 +++ packages/abrt/abrt-rpm.patch Mon Dec 7 12:43:25 2009 @@ -0,0 +1,105 @@ +--- abrt-1.0.0/src/Daemon/Makefile.am~ 2009-11-22 21:50:18.000000000 +0200 ++++ abrt-1.0.0/src/Daemon/Makefile.am 2009-12-07 13:07:30.732868433 +0200 +@@ -16,6 +16,7 @@ + abrtd_CPPFLAGS = \ + -I$(srcdir)/../../inc \ + -I$(srcdir)/../../lib/Utils \ ++ -I/usr/include/rpm \ + -DBIN_DIR=\"$(bindir)\" \ + -DVAR_RUN=\"$(VAR_RUN)\" \ + -DCONF_DIR=\"$(CONF_DIR)\" \ +--- abrt-1.0.0/src/Daemon/RPM.cpp~ 2009-12-07 13:30:42.000000000 +0200 ++++ abrt-1.0.0/src/Daemon/RPM.cpp 2009-12-07 13:30:44.935229032 +0200 +@@ -15,9 +15,11 @@ + + void CRPM::LoadOpenGPGPublicKey(const char* pFileName) + { ++#if 0 + uint8_t* pkt = NULL; + size_t pklen; + pgpKeyID_t keyID; ++ + if (pgpReadPkts(pFileName, &pkt, &pklen) != PGPARMOR_PUBKEY) + { + free(pkt); +@@ -33,11 +35,13 @@ + } + } + free(pkt); ++#endif + } + + bool CRPM::CheckFingerprint(const char* pPackage) + { + bool ret = false; ++#if 0 + rpmts ts = rpmtsCreate(); + rpmdbMatchIterator iter = rpmtsInitIterator(ts, RPMTAG_NAME, pPackage, 0); + Header header = rpmdbNextIterator(iter); +@@ -79,12 +83,14 @@ + } + rpmdbFreeIterator(iter); + rpmtsFree(ts); ++#endif + return ret; + } + + bool CheckHash(const char* pPackage, const char* pPath) + { + bool ret = false; ++#if 0 + rpmts ts = rpmtsCreate(); + rpmdbMatchIterator iter = rpmtsInitIterator(ts, RPMTAG_NAME, pPackage, 0); + Header header = rpmdbNextIterator(iter); +@@ -113,12 +119,14 @@ + } + rpmdbFreeIterator(iter); + rpmtsFree(ts); ++#endif + return ret; + } + + std::string GetDescription(const char* pPackage) + { + std::string pDescription = ""; ++#if 0 + rpmts ts = rpmtsCreate(); + rpmdbMatchIterator iter = rpmtsInitIterator(ts, RPMTAG_NAME, pPackage, 0); + Header header = rpmdbNextIterator(iter); +@@ -134,12 +142,14 @@ + } + rpmdbFreeIterator(iter); + rpmtsFree(ts); ++#endif + return pDescription; + } + + std::string GetComponent(const char* pFileName) + { + std::string ret = ""; ++#if 0 + rpmts ts = rpmtsCreate(); + rpmdbMatchIterator iter = rpmtsInitIterator(ts, RPMTAG_BASENAMES, pFileName, 0); + Header header = rpmdbNextIterator(iter); +@@ -158,12 +168,14 @@ + + rpmdbFreeIterator(iter); + rpmtsFree(ts); ++#endif + return ret; + } + + std::string GetPackage(const char* pFileName) + { + std::string ret = ""; ++#if 0 + rpmts ts = rpmtsCreate(); + rpmdbMatchIterator iter = rpmtsInitIterator(ts, RPMTAG_BASENAMES, pFileName, 0); + Header header = rpmdbNextIterator(iter); +@@ -179,5 +191,6 @@ + + rpmdbFreeIterator(iter); + rpmtsFree(ts); ++#endif + return ret; + } ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/abrt/abrt.spec?r1=1.4&r2=1.5&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
