diff options
| -rw-r--r-- | redhat/applications/kaffeine/kaffeine-14.0.0.spec | 10 | ||||
| -rw-r--r-- | redhat/dependencies/tqt3/tqt3-14.0.0.spec | 4 |
2 files changed, 9 insertions, 5 deletions
diff --git a/redhat/applications/kaffeine/kaffeine-14.0.0.spec b/redhat/applications/kaffeine/kaffeine-14.0.0.spec index e2711dd57..f99abde78 100644 --- a/redhat/applications/kaffeine/kaffeine-14.0.0.spec +++ b/redhat/applications/kaffeine/kaffeine-14.0.0.spec @@ -62,10 +62,16 @@ BuildRequires: libcdio-paranoia-devel # X11 stuff %if 0%{?mgaversion} || 0%{?mdkversion} +%if 0%{?mgaversion} >= 4 +BuildRequires: %{_lib}xext-devel +BuildRequires: %{_lib}xtst-devel +BuildRequires: %{_lib}xinerama-devel +%else BuildRequires: %{_lib}xext%{?mgaversion:6}-devel BuildRequires: %{_lib}xtst%{?mgaversion:6}-devel BuildRequires: %{_lib}xinerama%{?mgaversion:1}-devel %endif +%endif %if 0%{?rhel} == 4 BuildRequires: xorg-x11-devel %endif @@ -214,11 +220,11 @@ Requires: %{name} = %{version}-%{release} ########## - %if 0%{?suse_version} || 0%{?pclinuxos} %debug_package %endif +########## %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} @@ -227,6 +233,7 @@ Requires: %{name} = %{version}-%{release} %__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" + %build unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" @@ -272,6 +279,7 @@ export PATH="%{tde_bindir}:${PATH}" rm -f $RPM_BUILD_ROOT%{tde_libdir}/lib*.la rm -f $RPM_BUILD_ROOT%{tde_datadir}/mimelnk/application/x-mplayer2.desktop + %clean rm -rf $RPM_BUILD_ROOT diff --git a/redhat/dependencies/tqt3/tqt3-14.0.0.spec b/redhat/dependencies/tqt3/tqt3-14.0.0.spec index 53333ef3c..13ffbccf2 100644 --- a/redhat/dependencies/tqt3/tqt3-14.0.0.spec +++ b/redhat/dependencies/tqt3/tqt3-14.0.0.spec @@ -22,9 +22,6 @@ Prefix: %{tde_prefix} Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -# [tqt3] Build shared libraries -Patch1: tqt3-14.0.0-shared_lib.patch - BuildRequires: desktop-file-utils BuildRequires: libmng-devel BuildRequires: glibc-devel @@ -461,7 +458,6 @@ for the TQt 3 toolkit. %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%patch1 -p1 -b .sharedlibs # fix variables in 'qmake.conf' %__sed -i mkspecs/*/qmake.conf \ |