diff options
| author | François Andriot <[email protected]> | 2014-07-20 13:29:57 +0200 |
|---|---|---|
| committer | François Andriot <[email protected]> | 2014-07-20 13:29:57 +0200 |
| commit | e07b6bd3c5e686f60224c2cbd7f49a05becd7676 (patch) | |
| tree | 3de95a0eacf9510fb7e0b004fec0fa674e5c63b4 /redhat/dependencies | |
| parent | a7609c87e47b1a8bfafef1bab3d796770ba2f841 (diff) | |
| download | tde-packaging-e07b6bd3c5e686f60224c2cbd7f49a05becd7676.tar.gz tde-packaging-e07b6bd3c5e686f60224c2cbd7f49a05becd7676.zip | |
RPM Packaging: update R14 packages
Diffstat (limited to 'redhat/dependencies')
| -rw-r--r-- | redhat/dependencies/sip4-tqt/sip4-tqt.spec | 15 | ||||
| -rw-r--r-- | redhat/dependencies/tqt3/tqt3-14.0.0.spec | 3 |
2 files changed, 11 insertions, 7 deletions
diff --git a/redhat/dependencies/sip4-tqt/sip4-tqt.spec b/redhat/dependencies/sip4-tqt/sip4-tqt.spec index f87bedf88..5b6485d34 100644 --- a/redhat/dependencies/sip4-tqt/sip4-tqt.spec +++ b/redhat/dependencies/sip4-tqt/sip4-tqt.spec @@ -1,3 +1,9 @@ +# Note for RHEL6 / Fedora: +# Do *NOT* use 'byacc' to build sip4-tqt. +# Instead, use 'bison' with a wrapper shell script. +# e.g. /usr/local/bin/yacc +# contains 'bison --yacc $@' + # Default version for this component %define tde_pkg sip4-tqt %define tde_version 14.0.0 @@ -104,19 +110,14 @@ python ../configure.py \ -d %{python_sitearch}/sip4_tqt \ -e %{tde_includedir} \ -u STRIP="" \ - CFLAGS="${RPM_OPT_FLAGS} -I%{_includedir}/tqt -I%{_includedir}/tqt3 -I${PWD}/../sipgen" \ - CFLAGS_RELEASE="" \ - CXXFLAGS="${RPM_OPT_FLAGS} -I%{_includedir}/tqt -I%{_includedir}/tqt3 -I${PWD}/../sipgen" \ - CXXFLAGS_RELEASE="" + CFLAGS="${RPM_OPT_FLAGS} -I%{_includedir}/tqt -I%{_includedir}/tqt3 -I${PWD}/../sipgen -DYYERROR_VERBOSE" \ + CXXFLAGS="${RPM_OPT_FLAGS} -I%{_includedir}/tqt -I%{_includedir}/tqt3 -I${PWD}/../sipgen -DYYERROR_VERBOSE" %install %__rm -rf %{?buildroot} %__make install DESTDIR=%{?buildroot} -C build -# Dummy file to allow loading as a module -touch %{?buildroot}%{python_sitearch}/sip4_tqt/__init__.py - %clean %__rm -rf %{?buildroot} diff --git a/redhat/dependencies/tqt3/tqt3-14.0.0.spec b/redhat/dependencies/tqt3/tqt3-14.0.0.spec index 2cceff38c..3b1b8a34d 100644 --- a/redhat/dependencies/tqt3/tqt3-14.0.0.spec +++ b/redhat/dependencies/tqt3/tqt3-14.0.0.spec @@ -154,6 +154,9 @@ BuildRequires: libxmu-devel %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} BuildRequires: libXi-devel %endif +%if 0%{?mgaversion} +BuildRequires: %{_lib}xi-devel +%endif # Xorg support %if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version} |