diff options
| author | François Andriot <albator78@libertysurf.fr> | 2014-10-19 16:43:29 +0200 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2014-10-19 16:43:29 +0200 |
| commit | d23cfa711c7202dfe62c597f6b36e875405a5646 (patch) | |
| tree | 8e44d9aec60c5a24b9d7c365f9a5d36a6d7f76ad /redhat/applications/gtk3-tqt-engine | |
| parent | b044078982873fc5e30a2bb79b4bcd65e5ae806a (diff) | |
| download | tde-packaging-d23cfa711c7202dfe62c597f6b36e875405a5646.tar.gz tde-packaging-d23cfa711c7202dfe62c597f6b36e875405a5646.zip | |
RPM Packaging: update gtk3-tqt-engine
Diffstat (limited to 'redhat/applications/gtk3-tqt-engine')
3 files changed, 3 insertions, 26 deletions
diff --git a/redhat/applications/gtk3-tqt-engine/gtk3-tqt-engine-14.0.0-ftbfs.patch b/redhat/applications/gtk3-tqt-engine/gtk3-tqt-engine-14.0.0-ftbfs.patch deleted file mode 100644 index 8c4b63482..000000000 --- a/redhat/applications/gtk3-tqt-engine/gtk3-tqt-engine-14.0.0-ftbfs.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- trinity-gtk3-tqt-engine-14.0.0~pre82+f0afd14d/tdegtk/Makefile.am.ORI 2013-07-07 15:07:12.912770044 +0200 -+++ trinity-gtk3-tqt-engine-14.0.0~pre82+f0afd14d/tdegtk/Makefile.am 2013-07-07 15:11:43.224706604 +0200 -@@ -55,6 +55,6 @@ - libtqtcairo_la_CFLAGS = $(TDEGTK_CFLAGS) $(CAIRO_CFLAGS) $(GTK3_CFLAGS) - libtqtcairo_la_CXXFLAGS = $(TDEGTK_CXXFLAGS) $(TDEGTK_CFLAGS) $(CAIRO_CFLAGS) $(GTK3_CFLAGS) - --libtqtcairo_la_LIBADD = $(TDEGTK_LIBADD) -+libtqtcairo_la_LIBADD = $(TDEGTK_LIBADD) $(LIB_QT) $(LIB_TDEUI) - - libtqtcairo_la_LDFLAGS = $(TDEGTK_LDFLAGS) $(CAIRO_LIBS) $(GTK3_LIBS) diff --git a/redhat/applications/gtk3-tqt-engine/gtk3-tqt-engine-14.0.0-libsuffix.patch b/redhat/applications/gtk3-tqt-engine/gtk3-tqt-engine-14.0.0-libsuffix.patch deleted file mode 100644 index ce8bffee9..000000000 --- a/redhat/applications/gtk3-tqt-engine/gtk3-tqt-engine-14.0.0-libsuffix.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- trinity-gtk3-tqt-engine-14.0.0~pre82+f0afd14d/tdegtk/Makefile.am 2013-07-07 15:16:58.922069997 +0200 -+++ trinity-gtk3-tqt-engine-14.0.0~pre82+f0afd14d/tdegtk/Makefile.am.libsuffix 2013-07-07 15:23:35.272293968 +0200 -@@ -36,7 +36,7 @@ - $(srcdir)/tdegtk-baseengine.cpp \ - $(srcdir)/tdegtk-theme.cpp - --enginedir = $(GTK3_PREFIX)/lib/gtk-3.0/$(GTK3_VERSION)/theming-engines -+enginedir = $(GTK3_PREFIX)/lib64/gtk-3.0/$(GTK3_VERSION)/theming-engines - engine_LTLIBRARIES = libtdegtk.la - - libtdegtk_la_SOURCES = $(source_h) $(source_c) diff --git a/redhat/applications/gtk3-tqt-engine/gtk3-tqt-engine-14.0.0.spec b/redhat/applications/gtk3-tqt-engine/gtk3-tqt-engine-14.0.0.spec index a9c42d87d..31fd2e98d 100644 --- a/redhat/applications/gtk3-tqt-engine/gtk3-tqt-engine-14.0.0.spec +++ b/redhat/applications/gtk3-tqt-engine/gtk3-tqt-engine-14.0.0.spec @@ -40,7 +40,6 @@ Prefix: %{_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -Patch1: gtk3-tqt-engine-14.0.0-libsuffix.patch BuildRequires: trinity-tqtinterface-devel >= %{tde_version} BuildRequires: trinity-arts-devel >= 1:1.5.10 @@ -50,7 +49,7 @@ BuildRequires: desktop-file-utils BuildRequires: gettext -%if 0%{?fedora} || 0%{?suse_version} +%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 7 BuildRequires: gtk3-devel %else BuildRequires: gtk+3.0-devel @@ -60,7 +59,7 @@ BuildRequires: gtk+3.0-devel GTK3 style engine which uses the active TDE style to draw its widgets -%if 0%{?suse_version} || 0%{?pclinuxos} +%if 0%{?pclinuxos} %debug_package %endif @@ -68,7 +67,7 @@ GTK3 style engine which uses the active TDE style to draw its widgets %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %if "%_lib" == "lib64" -%patch1 -p1 -b .libsuffix +%__sed -i "tdegtk/Makefile.am" -e "s|/lib/|/lib64/|g" %endif %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" @@ -79,7 +78,6 @@ GTK3 style engine which uses the active TDE style to draw its widgets %build unset QTDIR QTINC QTLIB export PATH="%{tde_bindir}:${PATH}" -export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}" %configure \ --prefix=%{tde_prefix} \ |