From d8b8123fbed47bf03abbb379ff7e74906c0e9dd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Wed, 22 Jun 2011 09:54:40 +0100 Subject: [PATCH] Resolves: rhbz#715152 specificy which 'vendor' per distro --- libreoffice.spec | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/libreoffice.spec b/libreoffice.spec index 792d00b..f2ea09f 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -1,3 +1,10 @@ +# rhbz#715152 state vendor +%if 0%{?rhel} +%define vendoroption --with-vendor="Red Hat, Inc." +%endif +%if 0%{?fedora} +%define vendoroption --with-vendor="The Fedora Project" +%endif # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF %define __jar_repack %{nil} # don't worry about whitespace for now @@ -766,7 +773,7 @@ export CXXFLAGS=$ARCH_FLAGS autoconf %configure \ - --with-vendor="Red Hat, Inc." --with-num-cpus=$NBUILDS --with-max-jobs=$NDMAKES \ + %vendoroption --with-num-cpus=$NBUILDS --with-max-jobs=$NDMAKES \ --with-build-version="Ver: %{version}-%{release}" --with-unix-wrapper=%{name} \ --disable-ldap --disable-epm --disable-mathmldtd --disable-Xaw \ --disable-gnome-vfs --enable-gio --enable-symbols --enable-lockdown \