[libreoffice/f18] fedpkg always defines %{rhel}
David Tardon
dtardon at fedoraproject.org
Fri Dec 21 08:37:27 UTC 2012
commit 566a35a543b3ed8d9d6b1ba77036515278fef208
Author: David Tardon <dtardon at redhat.com>
Date: Fri Dec 21 09:36:38 2012 +0100
fedpkg always defines %{rhel}
libreoffice.spec | 52 ++++++++++++++++++++++++++--------------------------
1 files changed, 26 insertions(+), 26 deletions(-)
---
diff --git a/libreoffice.spec b/libreoffice.spec
index 87fd98b..20c41cb 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -274,7 +274,7 @@ Requires: %{name}-ure = %{epoch}:%{version}-%{release}
Requires: liberation-sans-fonts >= 1.0, liberation-serif-fonts >= 1.0, liberation-mono-fonts >= 1.0
Requires: dejavu-sans-fonts, dejavu-serif-fonts, dejavu-sans-mono-fonts
Requires: hyphen-en, hyphen >= 2.4, autocorr-en
-%if %{defined rhel} && 0%{?rhel} < 7
+%if 0%{?rhel} && 0%{?rhel} < 7
Requires: hunspell-en
%else
Requires: hunspell-en-US
@@ -284,7 +284,7 @@ Requires(post): gtk2 >= 2.9.4
Requires(preun): gtk2 >= 2.9.4
Requires(postun): gtk2 >= 2.9.4
Obsoletes: libreoffice-testtools < 1:3.4.99.1
-%if %{defined rhel} && 0%{?rhel} < 7
+%if 0%{?rhel} && 0%{?rhel} < 7
Provides: openoffice.org-core%{?_isa} = 1:3.3.0
Provides: openoffice.org-brand%{?_isa} = 1:3.3.0, broffice.org-brand%{?_isa} = 1:3.3.0
%endif
@@ -298,7 +298,7 @@ Group: Development/Libraries
Requires: %{name}-core = %{epoch}:%{version}-%{release}
Requires: %{name}-ure = %{epoch}:%{version}-%{release}
Requires: python
-%if %{defined rhel} && 0%{?rhel} < 7
+%if 0%{?rhel} && 0%{?rhel} < 7
Provides: openoffice.org-pyuno%{?_isa} = 1:3.3.0
%endif
@@ -317,7 +317,7 @@ Requires: hsqldb
Requires: %{name}-ure = %{epoch}:%{version}-%{release}
Requires: %{name}-core = %{epoch}:%{version}-%{release}
Requires: %{name}-calc = %{epoch}:%{version}-%{release}
-%if %{defined rhel} && 0%{?rhel} < 7
+%if 0%{?rhel} && 0%{?rhel} < 7
Provides: openoffice.org-base-core%{?_isa} = 1:3.3.0
Provides: openoffice.org-base%{?_isa} = 1:3.3.0, broffice.org-base%{?_isa} = 1:3.3.0
%endif
@@ -333,7 +333,7 @@ Requires: pentaho-reporting-flow-engine
Requires: %{name}-ure = %{epoch}:%{version}-%{release}
Requires: %{name}-core = %{epoch}:%{version}-%{release}
Requires: %{name}-base = %{epoch}:%{version}-%{release}
-%if %{defined rhel} && 0%{?rhel} < 7
+%if 0%{?rhel} && 0%{?rhel} < 7
Provides: openoffice.org-report-builder%{?_isa} = 1:3.3.0
%endif
@@ -347,7 +347,7 @@ Summary: BeanShell support for LibreOffice
Group: Development/Libraries
Requires: bsh
Requires: %{name}-core = %{epoch}:%{version}-%{release}
-%if %{defined rhel} && 0%{?rhel} < 7
+%if 0%{?rhel} && 0%{?rhel} < 7
Provides: openoffice.org-bsh%{?_isa} = 1:3.3.0
%endif
@@ -358,7 +358,7 @@ Support BeanShell scripts in LibreOffice.
Summary: JavaScript support for LibreOffice
Group: Development/Libraries
Requires: %{name}-core = %{epoch}:%{version}-%{release}
-%if %{defined rhel} && 0%{?rhel} < 7
+%if 0%{?rhel} && 0%{?rhel} < 7
Provides: openoffice.org-rhino%{?_isa} = 1:3.3.0
%endif
@@ -378,7 +378,7 @@ Requires: apache-commons-lang, apache-commons-logging
Requires: %{name}-ure = %{epoch}:%{version}-%{release}
Requires: %{name}-writer = %{epoch}:%{version}-%{release}
Requires: %{name}-core = %{epoch}:%{version}-%{release}
-%if %{defined rhel} && 0%{?rhel} < 7
+%if 0%{?rhel} && 0%{?rhel} < 7
Provides: openoffice.org-wiki-publisher%{?_isa} = 1:3.3.0
%endif
@@ -404,7 +404,7 @@ Group: Applications/Productivity
Requires: %{name}-ure = %{epoch}:%{version}-%{release}
Requires: %{name}-core = %{epoch}:%{version}-%{release}
Requires: %{name}-impress = %{epoch}:%{version}-%{release}
-%if %{defined rhel} && 0%{?rhel} < 7
+%if 0%{?rhel} && 0%{?rhel} < 7
Provides: openoffice.org-ogltrans%{?_isa} = 1:3.3.0
%endif
@@ -418,7 +418,7 @@ Group: Applications/Productivity
Requires: %{name}-ure = %{epoch}:%{version}-%{release}
Requires: %{name}-core = %{epoch}:%{version}-%{release}
Requires: %{name}-impress = %{epoch}:%{version}-%{release}
-%if %{defined rhel} && 0%{?rhel} < 7
+%if 0%{?rhel} && 0%{?rhel} < 7
Provides: openoffice.org-presentation-minimizer%{?_isa} = 1:3.3.0
%endif
@@ -433,7 +433,7 @@ Group: Applications/Productivity
Requires: %{name}-ure = %{epoch}:%{version}-%{release}
Requires: %{name}-core = %{epoch}:%{version}-%{release}
Requires: %{name}-impress = %{epoch}:%{version}-%{release}
-%if %{defined rhel} && 0%{?rhel} < 7
+%if 0%{?rhel} && 0%{?rhel} < 7
Provides: openoffice.org-presenter-screen%{?_isa} = 1:3.3.0
%endif
@@ -448,7 +448,7 @@ Group: Applications/Productivity
Requires: %{name}-ure = %{epoch}:%{version}-%{release}
Requires: %{name}-core = %{epoch}:%{version}-%{release}
Requires: %{name}-draw = %{epoch}:%{version}-%{release}
-%if %{defined rhel} && 0%{?rhel} < 7
+%if 0%{?rhel} && 0%{?rhel} < 7
Provides: openoffice.org-pdfimport%{?_isa} = 1:3.3.0
%endif
@@ -461,7 +461,7 @@ Summary: LibreOffice dingbats font
Group: User Interface/X
Requires: fontpackages-filesystem
BuildArch: noarch
-%if %{defined rhel} && 0%{?rhel} < 7
+%if 0%{?rhel} && 0%{?rhel} < 7
Provides: openoffice.org-fonts = 1:3.3.0
Provides: openoffice.org-opensymbol-fonts = 1:3.3.0
%endif
@@ -475,7 +475,7 @@ Summary: LibreOffice Word Processor Application
Group: Applications/Productivity
Requires: %{name}-core = %{epoch}:%{version}-%{release}
Requires: %{name}-ure = %{epoch}:%{version}-%{release}
-%if %{defined rhel} && 0%{?rhel} < 7
+%if 0%{?rhel} && 0%{?rhel} < 7
Provides: openoffice.org-writer-core%{?_isa} = 1:3.3.0
Provides: openoffice.org-writer%{?_isa} = 1:3.3.0, broffice.org-writer%{?_isa} = 1:3.3.0
%endif
@@ -488,7 +488,7 @@ Summary: Email mail-merge component for LibreOffice
Group: Applications/Productivity
Requires: %{name}-writer = %{epoch}:%{version}-%{release}
Requires: %{name}-pyuno = %{epoch}:%{version}-%{release}
-%if %{defined rhel} && 0%{?rhel} < 7
+%if 0%{?rhel} && 0%{?rhel} < 7
Provides: openoffice.org-emailmerge%{?_isa} = 1:3.3.0
%endif
@@ -500,7 +500,7 @@ Summary: LibreOffice Spreadsheet Application
Group: Applications/Productivity
Requires: %{name}-core = %{epoch}:%{version}-%{release}
Requires: %{name}-ure = %{epoch}:%{version}-%{release}
-%if %{defined rhel} && 0%{?rhel} < 7
+%if 0%{?rhel} && 0%{?rhel} < 7
Provides: openoffice.org-calc-core%{?_isa} = 1:3.3.0
Provides: openoffice.org-calc%{?_isa} = 1:3.3.0, broffice.org-calc%{?_isa} = 1:3.3.0
%endif
@@ -515,7 +515,7 @@ Requires: %{name}-core = %{epoch}:%{version}-%{release}
Requires: %{name}-ure = %{epoch}:%{version}-%{release}
Requires: %{name}-pdfimport = %{epoch}:%{version}-%{release}
Requires: %{name}-graphicfilter = %{epoch}:%{version}-%{release}
-%if %{defined rhel} && 0%{?rhel} < 7
+%if 0%{?rhel} && 0%{?rhel} < 7
Provides: openoffice.org-draw-core%{?_isa} = 1:3.3.0
Provides: openoffice.org-draw%{?_isa} = 1:3.3.0, broffice.org-draw%{?_isa} = 1:3.3.0
%endif
@@ -529,7 +529,7 @@ Group: Applications/Productivity
Requires: %{name}-core = %{epoch}:%{version}-%{release}
Requires: %{name}-ure = %{epoch}:%{version}-%{release}
Requires: %{name}-presenter-screen = %{epoch}:%{version}-%{release}
-%if %{defined rhel} && 0%{?rhel} < 7
+%if 0%{?rhel} && 0%{?rhel} < 7
Provides: openoffice.org-impress-core%{?_isa} = 1:3.3.0
Provides: openoffice.org-impress%{?_isa} = 1:3.3.0, broffice.org-impress%{?_isa} = 1:3.3.0
%endif
@@ -542,7 +542,7 @@ Summary: LibreOffice Equation Editor Application
Group: Applications/Productivity
Requires: %{name}-core = %{epoch}:%{version}-%{release}
Requires: %{name}-ure = %{epoch}:%{version}-%{release}
-%if %{defined rhel} && 0%{?rhel} < 7
+%if 0%{?rhel} && 0%{?rhel} < 7
Provides: openoffice.org-math-core%{?_isa} = 1:3.3.0
Provides: openoffice.org-math%{?_isa} = 1:3.3.0, broffice.org-math%{?_isa} = 1:3.3.
%endif
@@ -555,7 +555,7 @@ Summary: LibreOffice Extra Graphic filters
Group: Applications/Productivity
Requires: %{name}-ure = %{epoch}:%{version}-%{release}
Requires: %{name}-core = %{epoch}:%{version}-%{release}
-%if %{defined rhel} && 0%{?rhel} < 7
+%if 0%{?rhel} && 0%{?rhel} < 7
Provides: openoffice.org-graphicfilter%{?_isa} = 1:3.3.0
%endif
@@ -567,7 +567,7 @@ flash filters.
Summary: Optional xsltfilter module for LibreOffice
Group: Applications/Productivity
Requires: %{name}-core = %{epoch}:%{version}-%{release}
-%if %{defined rhel} && 0%{?rhel} < 7
+%if 0%{?rhel} && 0%{?rhel} < 7
Provides: openoffice.org-xsltfilter%{?_isa} = 1:3.3.0
%endif
@@ -579,7 +579,7 @@ xhtml export transforms. Install this to enable docbook export.
Summary: Optional javafilter module for LibreOffice
Group: Applications/Productivity
Requires: %{name}-core = %{epoch}:%{version}-%{release}
-%if %{defined rhel} && 0%{?rhel} < 7
+%if 0%{?rhel} && 0%{?rhel} < 7
Provides: openoffice.org-javafilter%{?_isa} = 1:3.3.0
%endif
@@ -609,7 +609,7 @@ creation and management of PostgreSQL databases through a GUI.
Summary: UNO Runtime Environment
Group: Development/Libraries
Requires: unzip, jre >= 1.5.0
-%if %{defined rhel} && 0%{?rhel} < 7
+%if 0%{?rhel} && 0%{?rhel} < 7
Provides: openoffice.org-ure%{?_isa} = 1:3.3.0
%endif
@@ -627,7 +627,7 @@ Group: Development/Libraries
Requires: %{name}-ure = %{epoch}:%{version}-%{release}
Requires: %{name}-core = %{epoch}:%{version}-%{release}
Requires: unzip, java-devel
-%if %{defined rhel} && 0%{?rhel} < 7
+%if 0%{?rhel} && 0%{?rhel} < 7
Provides: openoffice.org-sdk%{?_isa} = 1:3.3.0, openoffice.org-devel%{?_isa} = 1:3.3.0
%endif
@@ -641,7 +641,7 @@ building against the sdk use %{sdkinstdir}/setsdkenv_unix.sh.
Summary: Software Development Kit documentation for LibreOffice
Group: Documentation
Requires: %{name}-sdk = %{epoch}:%{version}-%{release}
-%if %{defined rhel} && 0%{?rhel} < 7
+%if 0%{?rhel} && 0%{?rhel} < 7
Provides: openoffice.org-sdk-doc%{?_isa} = 1:3.3.0
%endif
@@ -654,7 +654,7 @@ Summary: LibreOffice Headless plug-in
Group: Development/Libraries
Requires: %{name}-ure = %{epoch}:%{version}-%{release}
Requires: %{name}-core = %{epoch}:%{version}-%{release}
-%if %{defined rhel} && 0%{?rhel} < 7
+%if 0%{?rhel} && 0%{?rhel} < 7
Provides: openoffice.org-headless%{?_isa} = 1:3.3.0
%endif
More information about the scm-commits
mailing list