summaryrefslogtreecommitdiffstats
path: root/redhat/applications/kdesvn
diff options
context:
space:
mode:
authorFrancois Andriot <francois.andriot@free.fr>2012-05-05 11:09:11 +0200
committerFrancois Andriot <francois.andriot@free.fr>2012-05-05 11:09:11 +0200
commitd45bc6f2a0b63a4533b1d325207c9421ffd8051c (patch)
tree0178af4d916a54c33484bb7cab9ee148e9d09ea3 /redhat/applications/kdesvn
parent8b32b1132dd028eb502cc670932070dcd1e527c3 (diff)
downloadtde-packaging-d45bc6f2a0b63a4533b1d325207c9421ffd8051c.tar.gz
tde-packaging-d45bc6f2a0b63a4533b1d325207c9421ffd8051c.zip
RHEL/Fedora: fix lots of application building
Diffstat (limited to 'redhat/applications/kdesvn')
-rw-r--r--redhat/applications/kdesvn/kdesvn-3.5.13-fix_gcc47_compilation.patch11
-rw-r--r--redhat/applications/kdesvn/trinity-kdesvn.spec17
2 files changed, 26 insertions, 2 deletions
diff --git a/redhat/applications/kdesvn/kdesvn-3.5.13-fix_gcc47_compilation.patch b/redhat/applications/kdesvn/kdesvn-3.5.13-fix_gcc47_compilation.patch
new file mode 100644
index 000000000..850d5c7c0
--- /dev/null
+++ b/redhat/applications/kdesvn/kdesvn-3.5.13-fix_gcc47_compilation.patch
@@ -0,0 +1,11 @@
+--- kdesvn/src/kdesvnd/CMakeLists.txt.ORI 2012-05-01 23:53:03.503449741 +0200
++++ kdesvn/src/kdesvnd/CMakeLists.txt 2012-05-01 23:53:09.754340075 +0200
+@@ -23,7 +23,7 @@
+
+ SET_TARGET_PROPERTIES(kded_kdesvnd
+ PROPERTIES
+- LINK_FLAGS "${LINK_NO_UNDEFINED} ${_BASE_LDADD} ${APR_EXTRA_LIBFLAGS} ${APU_EXTRA_LIBFLAGS} -module")
++ LINK_FLAGS "${LINK_NO_UNDEFINED} ${_BASE_LDADD} ${APR_EXTRA_LIBFLAGS} ${APU_EXTRA_LIBFLAGS}")
+
+ INSTALL(TARGETS kded_kdesvnd
+ RUNTIME DESTINATION ${BIN_INSTALL_DIR}
diff --git a/redhat/applications/kdesvn/trinity-kdesvn.spec b/redhat/applications/kdesvn/trinity-kdesvn.spec
index 20904fd46..7f03c6c33 100644
--- a/redhat/applications/kdesvn/trinity-kdesvn.spec
+++ b/redhat/applications/kdesvn/trinity-kdesvn.spec
@@ -1,7 +1,7 @@
# Default version for this component
%define kdecomp kdesvn
%define version 1.0.4
-%define release 1
+%define release 2
# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
%if "%{?_prefix}" != "/usr"
@@ -33,6 +33,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{kdecomp}-3.5.13.tar.gz
+# [kdesvn] Fix compilation with GCC 4.7
+Patch1: kdesvn-3.5.13-fix_gcc47_compilation.patch
+
BuildRequires: tqtinterface-devel
BuildRequires: trinity-kdelibs-devel
BuildRequires: trinity-kdebase-devel
@@ -90,6 +93,7 @@ This package is part of tdesvn-trinity.
%prep
%setup -q -n applications/%{kdecomp}
+%patch1 -p1
# Ugly hack to modify TQT include directory inside autoconf files.
# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
@@ -137,11 +141,15 @@ export PATH="%{_bindir}:${PATH}"
%post
touch --no-create %{_datadir}/icons/hicolor || :
gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
-/sbin/ldconfig || :
%postun
touch --no-create %{_datadir}/icons/hicolor || :
gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
+
+%post -n trinity-libsvnqt
+/sbin/ldconfig || :
+
+%postun -n trinity-libsvnqt
/sbin/ldconfig || :
@@ -192,5 +200,10 @@ gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
%Changelog
+* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 1.0.4-2
+- Rebuilt for Fedora 17
+- Fix post and postun
+- Fix compilation with GCC 4.7
+
* Thu Dec 01 2011 Francois Andriot <francois.andriot@free.fr> - 1.0.4-1
- Initial build for RHEL 5, RHEL 6, Fedora 15, Fedora 16