Bailout when rpmbuild fails.

extras/contrib/src/Makefile

@@ -193,15 +193,15 @@ define RPM_PREPARE
 endef
 
 define RPM_BUILD_SPEC
-	CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" $(RPMBUILD) -v --rcfile /usr/lib/rpm/rpmrc:${PREFIX}/rpmrc -ba rpm/SPECS/$(subst -rpm,.spec,$@) || true
+	CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" $(RPMBUILD) -v --rcfile /usr/lib/rpm/rpmrc:${PREFIX}/rpmrc -ba rpm/SPECS/$(subst -rpm,.spec,$@
 endef
 
 define RPM_REBUILD_SRC
-	CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" $(RPMBUILD) -v --rcfile /usr/lib/rpm/rpmrc:${PREFIX}/rpmrc --rebuild $< || true
+	CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" $(RPMBUILD) -v --rcfile /usr/lib/rpm/rpmrc:${PREFIX}/rpmrc --rebuild $<
 endef
 
 define RPM_BUILD_COMPRESSED
-	CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" $(RPMBUILD) -v --rcfile /usr/lib/rpm/rpmrc:${PREFIX}/rpmrc -ta $< || true
+	CFLAGS="${CFLAGS}" LDFLAGS="${LDFLAGS}" $(RPMBUILD) -v --rcfile /usr/lib/rpm/rpmrc:${PREFIX}/rpmrc -ta $<
 endef
 
 ### Darwin-specific ###
@@ -1123,7 +1123,7 @@ libdvdnav-rpm: libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2
 	$(RPM_PREPARE)
 	cp Patches/dvdnav.patch rpm/SOURCES/
 	cp libdvdnav/misc/libdvdnav.spec rpm/SPECS/
-	sed -e 's/%define	prefix  \/home\/jpsaman\/Source\/vlc-0.8.6c-bugfix-m2x.git\/extras\/contrib/%define	prefix \/usr/' -e 's/Copyright:	GPL/License:	GPL\nPatch0:	dvdnav.patch/' -e 's/%setup/%setup  -n libdvdnav-${LIBDVDNAV_VERSION}\n%patch -p1/' -e 's/%{name}-%{version}.tar.gz/%{name}-${LIBDVDNAV_VERSION}.tar.bz2/' -e 's/#\/dvdnav.m4/%{prefix}\/include\/dvdread\/\*\n%{prefix}\/lib\/libdvdread.\*\n%{prefix}\/share\/aclocal\/dvdnav.m4/' -i.orig rpm/SPECS/libdvdnav.spec
+	sed -e 's/%define	prefix  \/home\/jpsaman\/Source\/vlc-0.8.6c-bugfix-m2x.git\/extras\/contrib/%define	prefix \/usr/' -e 's/Copyright:	GPL/License:	GPL\nPatch0:	dvdnav.patch/' -e 's/%setup/%setup  -n libdvdnav-${LIBDVDNAV_VERSION}\n%patch -p1/' -e 's/%{name}-%{version}.tar.gz/%{name}-${LIBDVDNAV_VERSION}.tar.bz2/' -e 's/#\/dvdnav.m4/%{prefix}\/include\/dvdread\/\*\n%{prefix}\/lib\/libdvdread.\*\n%{prefix}\/share\/aclocal\/dvdnav.m4/' -e 's/configure/configure --enable-static --with-libdvdcss=$${RPM_BUILD_DIR}\/libdvdcss/' -i.orig rpm/SPECS/libdvdnav.spec
 	$(RPM_BUILD_SPEC)
 	touch $@