summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrançois Andriot <[email protected]>2013-08-03 13:01:17 +0200
committerFrançois Andriot <[email protected]>2013-08-03 13:01:17 +0200
commit5427075cae2f0741c0d74a39e56737b968baf699 (patch)
treed4a3ad6532b316158e8569ed0426205c9d36e383
parentac05af8f5525aad2c5965e5fb3f7f081d6c9661b (diff)
downloadtde-packaging-5427075cae2f0741c0d74a39e56737b968baf699.tar.gz
tde-packaging-5427075cae2f0741c0d74a39e56737b968baf699.zip
RPM Packaging: update knmap, ksensors
-rw-r--r--redhat/applications/knmap/knmap-14.0.0.spec25
-rw-r--r--redhat/applications/ksensors/ksensors-14.0.0.spec24
2 files changed, 30 insertions, 19 deletions
diff --git a/redhat/applications/knmap/knmap-14.0.0.spec b/redhat/applications/knmap/knmap-14.0.0.spec
index 9db40398d..db1d89114 100644
--- a/redhat/applications/knmap/knmap-14.0.0.spec
+++ b/redhat/applications/knmap/knmap-14.0.0.spec
@@ -78,15 +78,20 @@ export PATH="%{tde_bindir}:${PATH}"
export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
%configure \
- --prefix=%{tde_prefix} \
- --exec-prefix=%{tde_prefix} \
- --disable-dependency-tracking \
- --disable-rpath \
- --bindir=%{tde_bindir} \
- --libdir=%{tde_libdir} \
- --datadir=%{tde_datadir} \
- --includedir=%{tde_tdeincludedir} \
- --enable-closure
+ --prefix=%{tde_prefix} \
+ --exec-prefix=%{tde_prefix} \
+ --bindir=%{tde_bindir} \
+ --libdir=%{tde_libdir} \
+ --datadir=%{tde_datadir} \
+ --includedir=%{tde_tdeincludedir} \
+ \
+ --disable-dependency-tracking \
+ --disable-debug \
+ --enable-new-ldflags \
+ --enable-final \
+ --enable-closure \
+ --disable-rpath \
+ --enable-gcc-hidden-visibility
%__make %{?_smp_mflags}
@@ -118,7 +123,7 @@ done
%defattr(-,root,root,-)
%doc AUTHORS COPYING README ChangeLog
%{tde_bindir}/knmap
-%{tde_datadir}/applnk/Utilities/knmap.desktop
+%{tde_datadir}/applnk/Internet/knmap.desktop
%{tde_datadir}/apps/knmap/knmapui.rc
%{tde_datadir}/apps/knmap/nmap_manpage.html
%{tde_datadir}/apps/knmap/nmap_manpage.html.diff
diff --git a/redhat/applications/ksensors/ksensors-14.0.0.spec b/redhat/applications/ksensors/ksensors-14.0.0.spec
index bb3f70a4e..3cdc9c4a7 100644
--- a/redhat/applications/ksensors/ksensors-14.0.0.spec
+++ b/redhat/applications/ksensors/ksensors-14.0.0.spec
@@ -75,16 +75,22 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
+# Warning: --enable-final causes FTBFS
%configure \
- --prefix=%{tde_prefix} \
- --exec-prefix=%{tde_prefix} \
- --disable-dependency-tracking \
- --disable-rpath \
- --bindir=%{tde_bindir} \
- --libdir=%{tde_libdir} \
- --datadir=%{tde_datadir} \
- --includedir=%{tde_tdeincludedir} \
- --enable-closure
+ --prefix=%{tde_prefix} \
+ --exec-prefix=%{tde_prefix} \
+ --bindir=%{tde_bindir} \
+ --libdir=%{tde_libdir} \
+ --datadir=%{tde_datadir} \
+ --includedir=%{tde_tdeincludedir} \
+ \
+ --disable-dependency-tracking \
+ --disable-debug \
+ --enable-new-ldflags \
+ --disable-final \
+ --enable-closure \
+ --disable-rpath \
+ --enable-gcc-hidden-visibility
%__make %{?_smp_mflags}