diff options
| author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-11-04 12:48:59 -0500 |
|---|---|---|
| committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-11-04 12:48:59 -0500 |
| commit | 169853a068683db6540e3b77542d5139bb7867d1 (patch) | |
| tree | 2163209e7dc0569f9b0f68cf15284fe80f8c9e2e /redhat/kdebase/trinity-kdebase-3.5.12.spec | |
| parent | 7acfaa9e6409ed0ebdbc2e6fb67e8bc9b64b33d2 (diff) | |
| parent | 43240f192dbdd0c0d267bc7c4a96f123704f0e2b (diff) | |
| download | tde-packaging-169853a068683db6540e3b77542d5139bb7867d1.tar.gz tde-packaging-169853a068683db6540e3b77542d5139bb7867d1.zip | |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging
Diffstat (limited to 'redhat/kdebase/trinity-kdebase-3.5.12.spec')
| -rwxr-xr-x | redhat/kdebase/trinity-kdebase-3.5.12.spec | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/redhat/kdebase/trinity-kdebase-3.5.12.spec b/redhat/kdebase/trinity-kdebase-3.5.12.spec index b3df6b097..3229fe15d 100755 --- a/redhat/kdebase/trinity-kdebase-3.5.12.spec +++ b/redhat/kdebase/trinity-kdebase-3.5.12.spec @@ -2,7 +2,7 @@ %if "%{?version}" == "" %define version 3.5.12 %endif -%define release 11 +%define release 12 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -51,6 +51,8 @@ Patch4: http://www.trinitydesktop.org/patches/r1182808.diff # [kdebase] fixed an incompatibility with gcc 4.5 Patch8: http://www.trinitydesktop.org/patches/r1221326.diff +Patch11: kdebase-3.5.12-kickerfix.patch + # TDE Official patches (from SVN), modified # [kdebase/ksmserver/shutdowndlg.cpp] Fixed invalid constructor per GCC 4.5.2 Patch7: kdebase-3.5.12-r1220975.patch @@ -150,7 +152,7 @@ Requires: %{name} = %{version}-%{release} %package libs Summary: %{name} runtime libraries Group: System Environment/Libraries -Requires: trinity-kdelibs >= %{version} +Requires: trinity-kdelibs %if "%{?_prefix}" == "/usr" Obsoletes: kdebase%{?_qt_suffix}-libs %endif @@ -185,6 +187,7 @@ Protocol handlers (KIOslaves) for personal information management, including: %if 0%{?rhel} && 0%{?rhel} < 6 %patch10 -p1 %endif +%patch11 -d kicker/kicker %__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" |