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/kdeaddons | |
| parent | f345812d8248f8a1c6a062cb5af470a9f44b0dc0 (diff) | |
| download | tde-packaging-dcfb68136c0561ba4bcbef1336ff6f02b49c8900.tar.gz tde-packaging-dcfb68136c0561ba4bcbef1336ff6f02b49c8900.zip | |
RHEL/Fedora: updates main components
Diffstat (limited to 'redhat/kdeaddons')
| -rw-r--r-- | redhat/kdeaddons/trinity-kdeaddons-3.5.13.spec | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/redhat/kdeaddons/trinity-kdeaddons-3.5.13.spec b/redhat/kdeaddons/trinity-kdeaddons-3.5.13.spec index 3650c8332..acf01c9bd 100644 --- a/redhat/kdeaddons/trinity-kdeaddons-3.5.13.spec +++ b/redhat/kdeaddons/trinity-kdeaddons-3.5.13.spec @@ -2,12 +2,12 @@ %if "%{?version}" == "" %define version 3.5.13 %endif -%define release 3 +%define release 4 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" %define _variant .opt -%define _docdir %{_prefix}/share/doc +%define _docdir %{_datadir}/doc %endif # TDE 3.5.13 specific building variables @@ -36,8 +36,6 @@ Source0: kdeaddons-%{version}.tar.gz Source1: metabar-fedora.tar.bz2 Source2: metabarrc -Patch3: kdeaddons-3.5.3-sdl.patch - BuildRequires: trinity-kdebase-devel BuildRequires: trinity-kdegames-devel BuildRequires: trinity-kdemultimedia-devel @@ -83,16 +81,14 @@ This package includes: %prep %setup -q -a 1 -n kdeaddons -%patch3 -p1 -b .sdl - # Ugly hack to modify TQT include directory inside autoconf files. # If TQT detection fails, it fallbacks to TQT4 instead of TQT3 ! %__sed -i admin/acinclude.m4.in \ - -e "s,/usr/include/tqt,%{_includedir}/tqt,g" \ - -e "s,kde_htmldir='.*',kde_htmldir='%{tde_docdir}/HTML',g" + -e "s|/usr/include/tqt|%{_includedir}/tqt|g" \ + -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_docdir}/HTML'|g" -%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" -%__cp "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" +%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" +%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh" %__make -f "admin/Makefile.common" @@ -247,6 +243,9 @@ gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||: %changelog +* Sat May 05 2012 Francois Andriot <francois.andriot@free.fr> - 3.5.13-4 +- Removes SDL patch for noatun + * Thu Dec 15 2011 Francois Andriot <francois.andriot@free.fr> - 3.5.13-3 - Fix content of -extras package - Fix various packaging issues |