diff --git a/abrt.spec.in b/abrt.spec.in index 341d1b8..b1f6807 100644 --- a/abrt.spec.in +++ b/abrt.spec.in @@ -16,10 +16,17 @@ %endif %endif +%define suse 0 %if 0%{?rhel} >= 6 %define desktopvendor redhat %else -%define desktopvendor fedora + %if 0%{?suse_version} + %define desktopvendor suse + %define suse 1 + %bcond_without systemd + %else + %define desktopvendor fedora + %endif %endif Summary: Automatic bug detection and reporting tool @@ -30,7 +37,14 @@ License: GPLv2+ Group: Applications/System URL: https://fedorahosted.org/abrt/ Source: https://fedorahosted.org/released/%{name}/%{name}-%{version}.tar.gz +%if %{suse} +BuildRequires: dbus-1-devel +BuildRequires: dbus-1-glib-devel +BuildRequires: mozilla-nss-devel +%else BuildRequires: dbus-devel +BuildRequires: nss-devel +%endif BuildRequires: gtk3-devel BuildRequires: rpm-devel >= 4.6 BuildRequires: desktop-file-utils @@ -41,18 +55,25 @@ BuildRequires: gettext BuildRequires: libxml2-devel BuildRequires: intltool BuildRequires: libtool -BuildRequires: nss-devel BuildRequires: asciidoc BuildRequires: xmlto BuildRequires: libreport-devel >= 2.0.10 BuildRequires: btparser-devel %if %{with systemd} +%if %{suse} +Requires: systemd +%else Requires: systemd-units %endif +%endif BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: %{name}-libs = %{version}-%{release} +%if %{suse} +Requires(pre): pwdutils +%else Requires(pre): shadow-utils +%endif Obsoletes: abrt-plugin-sqlite3 > 0.0.1 # required for transition from 1.1.13, can be removed after some time Obsoletes: abrt-plugin-runapp > 0.0.1 @@ -147,6 +168,7 @@ Requires: crash %description addon-vmcore This package contains plugin for collecting kernel crash information from vmcore files. +%if !%{suse} %package plugin-bodhi Summary: %{name}'s bodhi plugin BuildRequires: json-c-devel @@ -158,6 +180,7 @@ Provides: libreport-plugin-bodhi %description plugin-bodhi Search for a new updates in bodhi server. +%endif %package addon-python Summary: %{name}'s addon for catching and analyzing Python exceptions @@ -237,7 +260,11 @@ uses PolicyKit to authorize to access the problem data. %build autoconf -CFLAGS="%{optflags} -Werror" %configure --disable-silent-rules +CFLAGS="%{optflags} -Werror" %configure \ +%if %{suse} + --with-systemdsystemunitdir=%{_unitdir} \ +%endif + --disable-silent-rules make %{?_smp_mflags} %install @@ -626,10 +653,12 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || : %files desktop %defattr(-,root,root,-) +%if !%{suse} %files plugin-bodhi %defattr(-,root,root,-) %{_bindir}/abrt-bodhi %{_mandir}/man1/abrt-bodhi.1.gz +%endif %files dbus %defattr(-,root,root,-) diff --git a/configure.ac b/configure.ac index 3cd7776..1dcf4d8 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ AC_INIT([abrt], [crash-catcher@fedorahosted.org]) AC_CONFIG_MACRO_DIR([m4]) -AM_INIT_AUTOMAKE([-Wall -Werror foreign]) +AM_INIT_AUTOMAKE([-Wall foreign]) # Support silent build rules. Disable by either passing --disable-silent-rules # to ./configure or passing V=1 to make m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES]) @@ -11,9 +11,11 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES]) AM_SILENT_RULES([yes]) +AM_PROG_AR AC_DISABLE_STATIC AC_PROG_LIBTOOL AC_PROG_CC +AM_PROG_CC_C_O AC_PROG_LN_S AC_SYS_LARGEFILE diff --git a/doc/Makefile.am b/doc/Makefile.am index 2ed3714..a78976d 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -18,7 +18,7 @@ MAN1_TXT += abrt-cli.txt MAN1_TXT += abrt-action-save-package-data.txt MAN1_TXT += abrt-install-ccpp-hook.txt MAN1_TXT += abrt-action-analyze-vmcore.txt -MAN1_TXT += abrt-bodhi.txt +#MAN1_TXT += abrt-bodhi.txt MAN5_TXT = MAN5_TXT += abrt.conf.txt diff --git a/po/POTFILES.in b/po/POTFILES.in index d16d3e0..8cf2df1 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -33,7 +33,7 @@ src/plugins/analyze_LocalGDB.xml.in src/plugins/analyze_RetraceServer.xml.in src/plugins/collect_xsession_errors.xml.in src/plugins/https-utils.c -src/plugins/bodhi.c +#src/plugins/bodhi.c src/cli/abrt-cli.c src/cli/list.c diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am index eb118ad..16a7e9f 100644 --- a/src/plugins/Makefile.am +++ b/src/plugins/Makefile.am @@ -21,8 +21,8 @@ bin_PROGRAMS = \ abrt-action-generate-core-backtrace \ abrt-action-analyze-backtrace \ abrt-retrace-client \ - abrt-dedup-client \ - abrt-bodhi + abrt-dedup-client +# abrt-bodhi libexec_PROGRAMS = abrt-action-install-debuginfo-to-abrt-cache @@ -274,22 +274,22 @@ abrt_dedup_client_SOURCES = \ $(BTPARSER_LIBS) \ $(NSS_LIBS) -abrt_bodhi_SOURCES = \ - bodhi.c - abrt_bodhi_CPPFLAGS = \ - -I$(srcdir)/../include \ - -I$(srcdir)/../lib \ - $(GLIB_CFLAGS) \ - $(LIBREPORT_CFLAGS) \ - $(LIBREPORT_WEB_CFLAGS) \ - $(JSON_C_CFLAGS) \ - $(RPM_CFLAGS) \ - -D_GNU_SOURCE - abrt_bodhi_LDADD = \ - $(JSON_C_LIBS) \ - $(RPM_LIBS) \ - $(LIBREPORT_LIBS) \ - $(LIBREPORT_WEB_LIBS) +#abrt_bodhi_SOURCES = \ +# bodhi.c +# abrt_bodhi_CPPFLAGS = \ +# -I$(srcdir)/../include \ +# -I$(srcdir)/../lib \ +# $(GLIB_CFLAGS) \ +# $(LIBREPORT_CFLAGS) \ +# $(LIBREPORT_WEB_CFLAGS) \ +# $(JSON_C_CFLAGS) \ +# $(RPM_CFLAGS) \ +# -D_GNU_SOURCE +# abrt_bodhi_LDADD = \ +# $(JSON_C_LIBS) \ +# $(RPM_LIBS) \ +# $(LIBREPORT_LIBS) \ +# $(LIBREPORT_WEB_LIBS) DEFS = -DLOCALEDIR=\"$(localedir)\" @DEFS@