From 64b7f916bb1d52cae7d5024d9dbc4852fb9cf06f Mon Sep 17 00:00:00 2001 From: Nikola Pajkovsky Date: Fri, 29 Apr 2011 11:05:04 +0200 Subject: build: run autoconf --force before build rpm to avoid missing tarball Signed-off-by: Nikola Pajkovsky --- Makefile.am | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile.am b/Makefile.am index 7201f608..272272af 100644 --- a/Makefile.am +++ b/Makefile.am @@ -18,10 +18,12 @@ RPM_DIRS = --define "_sourcedir `pwd`" \ rpm: dist ./gen-version + autoconf --force rpmbuild $(RPM_DIRS) -ba abrt.spec srpm: dist ./gen-version + autoconf --force rpmbuild $(RPM_DIRS) -bs abrt.spec # value for overriding from command line -- cgit From 16c2aed6db81b68ef89c76324e706590e5f54e91 Mon Sep 17 00:00:00 2001 From: Jiri Moskovcak Date: Fri, 29 Apr 2011 12:09:39 +0200 Subject: spec: use versioned deps on libreport --- abrt.spec.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/abrt.spec.in b/abrt.spec.in index efe47ab0..691e3923 100644 --- a/abrt.spec.in +++ b/abrt.spec.in @@ -79,6 +79,7 @@ Development libraries and headers for libreport. Summary: Python bindings for report-libs. # Is group correct here? - Group: System Environment/Libraries +Requires: libreport = %{version}-%{release} %description -n libreport-python Python bindings for report-libs. @@ -86,6 +87,7 @@ Python bindings for report-libs. %package -n libreport-gtk Summary: GTK frontend for libreport Group: User Interface/Desktops +Requires: libreport = %{version}-%{release} %description -n libreport-gtk Applications for reporting bugs using libreport backend. -- cgit From 14e88b51b262a9eb829268f8c6fad0399b5fe675 Mon Sep 17 00:00:00 2001 From: Jiri Moskovcak Date: Fri, 29 Apr 2011 12:56:51 +0200 Subject: build fixes --- Makefile.am | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/Makefile.am b/Makefile.am index 272272af..731e7e03 100644 --- a/Makefile.am +++ b/Makefile.am @@ -16,14 +16,16 @@ RPM_DIRS = --define "_sourcedir `pwd`" \ --define "_builddir `pwd`" \ --define "_srcrpmdir `pwd`" -rpm: dist - ./gen-version +rpm: autoconf --force + ./gen-version + $(MAKE) dist rpmbuild $(RPM_DIRS) -ba abrt.spec -srpm: dist - ./gen-version +srpm: autoconf --force + ./gen-version + $(MAKE) dist rpmbuild $(RPM_DIRS) -bs abrt.spec # value for overriding from command line -- cgit