diff options
| author | François Andriot <albator78@libertysurf.fr> | 2013-11-24 16:48:53 +0100 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2013-11-24 16:48:53 +0100 |
| commit | e9e7fa543273fffa8131b2244e5c994fe22616e2 (patch) | |
| tree | 6934c069a51e0e17a4a2df4b0521d3f00364a5ac /redhat/tdegraphics | |
| parent | 2bdb0ca57d3ad95d94d1c20a395c5bf210bbcacd (diff) | |
| download | tde-packaging-e9e7fa543273fffa8131b2244e5c994fe22616e2.tar.gz tde-packaging-e9e7fa543273fffa8131b2244e5c994fe22616e2.zip | |
RPM Packaging: fix build issue on openSUSE 13.1
Diffstat (limited to 'redhat/tdegraphics')
| -rw-r--r-- | redhat/tdegraphics/tdegraphics-14.0.0.spec | 18 | ||||
| -rw-r--r-- | redhat/tdegraphics/tdegraphics-3.5.13.2.spec | 16 |
2 files changed, 21 insertions, 13 deletions
diff --git a/redhat/tdegraphics/tdegraphics-14.0.0.spec b/redhat/tdegraphics/tdegraphics-14.0.0.spec index d72420c0b..0f07bb31e 100644 --- a/redhat/tdegraphics/tdegraphics-14.0.0.spec +++ b/redhat/tdegraphics/tdegraphics-14.0.0.spec @@ -88,12 +88,16 @@ BuildRequires: libpaper-devel %endif # T1LIB support -%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} <= 1230 +%define with_t1lib 1 +BuildRequires: t1lib-devel +%endif +%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?fedora} %define with_t1lib 1 %if 0%{?mgaversion} || 0%{?mdkversion} BuildRequires: %{_lib}t1lib-devel %endif -%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} +%if 0%{?rhel} >= 5 || 0%{?fedora} BuildRequires: t1lib-devel %endif %endif @@ -174,7 +178,7 @@ BuildRequires: %{_lib}poppler-devel %endif %if 0%{?rhel} >= 4 && 0%{?rhel} <= 5 # On RHEL 5, the distro-provided poppler is too old. We built a newer one. -BuildRequires: trinity-poppler-devel +BuildRequires: trinity-poppler-devel >= 0.12 BuildRequires: trinity-poppler-qt3-devel >= 0.12 %endif @@ -1267,10 +1271,10 @@ if [ -d /usr/X11R6 ]; then export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}" fi -%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} -%__mkdir_p build -cd build -%endif +if ! rpm -E %%cmake|grep -q "cd build"; then + %__mkdir_p build + cd build +fi # Warning: GCC visibility causes FTBFS [Bug #1285] %cmake \ diff --git a/redhat/tdegraphics/tdegraphics-3.5.13.2.spec b/redhat/tdegraphics/tdegraphics-3.5.13.2.spec index a27951ea6..9fc24e792 100644 --- a/redhat/tdegraphics/tdegraphics-3.5.13.2.spec +++ b/redhat/tdegraphics/tdegraphics-3.5.13.2.spec @@ -88,12 +88,16 @@ BuildRequires: libpaper-devel %endif # T1LIB support -%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} +%if 0%{?suse_version} && 0%{?suse_version} <= 1230 +%define with_t1lib 1 +BuildRequires: t1lib-devel +%endif +%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 5 || 0%{?fedora} %define with_t1lib 1 %if 0%{?mgaversion} || 0%{?mdkversion} BuildRequires: %{_lib}t1lib-devel %endif -%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} +%if 0%{?rhel} >= 5 || 0%{?fedora} BuildRequires: t1lib-devel %endif %endif @@ -1270,10 +1274,10 @@ if [ -d /usr/X11R6 ]; then export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}" fi -%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} -%__mkdir_p build -cd build -%endif +if ! rpm -E %%cmake|grep -q "cd build"; then + %__mkdir_p build + cd build +fi # Note: the "-L%{tde_libdir}" is required for RHEL5, where poppler is under /opt/trinity. %cmake \ |