diff options
| author | Francois Andriot <francois.andriot@free.fr> | 2012-05-05 11:33:09 +0200 |
|---|---|---|
| committer | Francois Andriot <francois.andriot@free.fr> | 2012-05-05 11:33:09 +0200 |
| commit | dcfb68136c0561ba4bcbef1336ff6f02b49c8900 (patch) | |
| tree | 452dfc902693c31d8b5c4a088c63f56878073862 /redhat/kdevelop | |
| parent | f345812d8248f8a1c6a062cb5af470a9f44b0dc0 (diff) | |
| download | tde-packaging-dcfb68136c0561ba4bcbef1336ff6f02b49c8900.tar.gz tde-packaging-dcfb68136c0561ba4bcbef1336ff6f02b49c8900.zip | |
RHEL/Fedora: updates main components
Diffstat (limited to 'redhat/kdevelop')
| -rw-r--r-- | redhat/kdevelop/c_cpp_reference-2.0.2-install.patch | 9 | ||||
| -rw-r--r-- | redhat/kdevelop/trinity-kdevelop-3.5.13.spec | 9 |
2 files changed, 17 insertions, 1 deletions
diff --git a/redhat/kdevelop/c_cpp_reference-2.0.2-install.patch b/redhat/kdevelop/c_cpp_reference-2.0.2-install.patch new file mode 100644 index 000000000..28a24eefb --- /dev/null +++ b/redhat/kdevelop/c_cpp_reference-2.0.2-install.patch @@ -0,0 +1,9 @@ +--- kdevelop/c_cpp_reference-2.0.2_for_KDE_3.0/reference/C/CONTRIB/SNIP/Makefile.am.ORI 2012-05-01 09:52:59.334490901 -0400 ++++ kdevelop/c_cpp_reference-2.0.2_for_KDE_3.0/reference/C/CONTRIB/SNIP/Makefile.am 2012-05-01 09:53:10.229644843 -0400 +@@ -1,5 +1,5 @@ + EXTRA_DIST = $(wildcard *.html) $(wildcard *.c) $(wildcard *.h) $(wildcard *.asm) $(wildcard *.txt) \ +- 8087_sav.asm HEADER.html c_lines.awk except.doc file_id.diz make.ini match.doc myio.cpp \ ++ HEADER.html c_lines.awk except.doc file_id.diz make.ini match.doc myio.cpp \ + myio.mak myiodemo.cpp myline.cpp mystream.cpp pdn.lst read.me resource.lst rg_qsort.c1 \ + rg_qsort.c2 snippets._c_ snippets.ndx snippets.txt snippets.wc storage.typ str.cpp str.doc + diff --git a/redhat/kdevelop/trinity-kdevelop-3.5.13.spec b/redhat/kdevelop/trinity-kdevelop-3.5.13.spec index e47bc717e..79a037dfb 100644 --- a/redhat/kdevelop/trinity-kdevelop-3.5.13.spec +++ b/redhat/kdevelop/trinity-kdevelop-3.5.13.spec @@ -2,7 +2,7 @@ %if "%{?version}" == "" %define version 3.5.13 %endif -%define release 2 +%define release 3 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -47,6 +47,8 @@ Patch1: c_cpp_reference-2.0.2-config.patch Patch2: kdevelop-3.5.13-kdevdesigner-ftbfs.patch # Fix compilation with GCC 4.7 Patch3: kdevelop-3.5.13-gcc47.patch +# Fix installation of 'asm' files +Patch4: c_cpp_reference-2.0.2-install.patch Provides: kdevelop3 = %{version}-%{release} @@ -128,6 +130,7 @@ Requires: %{name} = %{version}-%{release} %patch1 -p0 -b .config %patch2 -p1 %patch3 -p1 -b .gcc47 +%patch4 -p1 # Ugly hack to modify TQT include directory inside autoconf files. # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! @@ -234,6 +237,10 @@ update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || : %changelog +* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-3 +- Fix installation on Fedora 17 +- Fix compilation on GCC 4.7 + * Fri Nov 25 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-2 - Fix HTML directory location |