diff options
| author | François Andriot <albator78@libertysurf.fr> | 2015-08-30 12:27:30 +0200 |
|---|---|---|
| committer | François Andriot <albator78@libertysurf.fr> | 2015-08-30 12:27:30 +0200 |
| commit | 972e86c4ebf80d36fffc6c9d02a3d1596ca61fb2 (patch) | |
| tree | ab6620583bc880bd61cceb0058ecc1f7e896b992 /redhat/main/tdepim | |
| parent | e5f2386a7884932cffd7c862b6ddedbd2e8a6810 (diff) | |
| download | tde-packaging-972e86c4ebf80d36fffc6c9d02a3d1596ca61fb2.tar.gz tde-packaging-972e86c4ebf80d36fffc6c9d02a3d1596ca61fb2.zip | |
RPM packaging: massive update SPEC files
Diffstat (limited to 'redhat/main/tdepim')
| -rw-r--r-- | redhat/main/tdepim/tdepim-14.0.0.spec | 12 | ||||
| -rw-r--r-- | redhat/main/tdepim/tdepim-3.5.13.2.spec | 7 |
2 files changed, 7 insertions, 12 deletions
diff --git a/redhat/main/tdepim/tdepim-14.0.0.spec b/redhat/main/tdepim/tdepim-14.0.0.spec index 251f93cdb..0c176e041 100644 --- a/redhat/main/tdepim/tdepim-14.0.0.spec +++ b/redhat/main/tdepim/tdepim-14.0.0.spec @@ -37,11 +37,6 @@ %define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdelibdir %{tde_libdir}/trinity -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # KDEPIM specific features %if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} @@ -56,7 +51,7 @@ BuildRequires: gnokii-devel Name: trinity-%{tde_pkg} Summary: Personal Information Management apps from the official Trinity release Version: %{tde_version} -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist} Group: Applications/Productivity URL: http://www.trinitydesktop.org/ @@ -2292,6 +2287,11 @@ update-desktop-database %{tde_datadir}/applications > /dev/null 2>&1 || : %prep %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} +# Fix 'ical2vcal' contains '/bin/perl' instead of '/usr/bin/perl' +if [ -x /usr/bin/perl ]; then + %__sed -i "korganizer/ical2vcal.in" -e "s|@PERL@|/usr/bin/perl|" +fi + %build unset QTDIR QTINC QTLIB diff --git a/redhat/main/tdepim/tdepim-3.5.13.2.spec b/redhat/main/tdepim/tdepim-3.5.13.2.spec index 39194a7f1..d7fcb7e6e 100644 --- a/redhat/main/tdepim/tdepim-3.5.13.2.spec +++ b/redhat/main/tdepim/tdepim-3.5.13.2.spec @@ -34,11 +34,6 @@ %define tde_tdeincludedir %{tde_includedir}/tde %define tde_tdelibdir %{tde_libdir}/trinity -# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". -%if "%{?tde_prefix}" != "/usr" -%define _variant .opt -%endif - # KDEPIM specific features %if 0%{?fedora} || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} @@ -53,7 +48,7 @@ BuildRequires: gnokii-devel Name: trinity-%{tde_pkg} Summary: Personal Information Management apps from the official Trinity release Version: %{tde_version} -Release: %{?!preversion:4}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} +Release: %{?!preversion:4}%{?preversion:0_%{preversion}}%{?dist} Group: Applications/Productivity URL: http://www.trinitydesktop.org/ |