RPM: massive update and cleanup

3 files changed, 33 insertions, 177 deletions

diff --git a/redhat/applications/tdeio-apt/tdeio-apt-3.5.13.2-ftbfs.patch b/redhat/applications/tdeio-apt/tdeio-apt-3.5.13.2-ftbfs.patch
deleted file mode 100644
index b83b3f3ad..000000000
--- a/redhat/applications/tdeio-apt/tdeio-apt-3.5.13.2-ftbfs.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- trinity-tdeio-apt-14.0.0~pre105+c7bc8b76/src/apt.cpp.ORI	2013-07-29 11:26:26.740982531 +0200
-+++ trinity-tdeio-apt-14.0.0~pre105+c7bc8b76/src/apt.cpp	2013-07-29 11:26:53.970250335 +0200
-@@ -143,10 +143,10 @@
-  */
- 
- static const TQString
--  html_form_begin("\n<form action=\"apt:/\" method=\"GET\">\n"
-+  html_form_begin_apt("\n<form action=\"apt:/\" method=\"GET\">\n"
-                   "<table class=\"query\">\n");
- static const TQString
--  html_form_end("<tr>\n"
-+  html_form_end_apt("<tr>\n"
-                 "\t<td class=\"button\" colspan=\"2\"><input type=\"submit\" value=\"%1\"></td>\n"
-                 "</tr>\n"
-                 "</table>\n"
-@@ -197,7 +197,7 @@
-   if (online)
-     stream << "<table class=\"queryform\"><tr><td>\n";
- 
--  stream << html_form_begin;
-+  stream << html_form_begin_apt;
-   stream << "<tr><td colspan=\"2\" class=\"title\">" + i18n("Offline search") + "</td></tr>" << endl;
-   stream << make_html_form_line("search", i18n("Package search"));
-   if (ext_form)
-@@ -206,7 +206,7 @@
-       stream << make_html_form_line("fsearch", i18n("File search"));
-     stream << make_html_form_line("show", i18n("Package info"));
-   }
--  stream << html_form_end.arg( i18n("Search") );
-+  stream << html_form_end_apt.arg( i18n("Search") );
- 
-   if (online)
-   {
diff --git a/redhat/applications/tdeio-apt/tdeio-apt-3.5.13.2.spec b/redhat/applications/tdeio-apt/tdeio-apt-3.5.13.2.spec
deleted file mode 100644
index e45848c73..000000000
--- a/redhat/applications/tdeio-apt/tdeio-apt-3.5.13.2.spec
+++ /dev/null
@@ -1,121 +0,0 @@
-# Default version for this component
-%define tde_pkg tdeio-apt
-%define tde_version 3.5.13.2
-
-# TDE specific building variables
-%define tde_bindir %{tde_prefix}/bin
-%define tde_datadir %{tde_prefix}/share
-%define tde_docdir %{tde_datadir}/doc
-%define tde_includedir %{tde_prefix}/include
-%define tde_libdir %{tde_prefix}/%{_lib}
-%define tde_mandir %{tde_datadir}/man
-%define tde_appdir %{tde_datadir}/applications
-
-%define tde_tdeappdir %{tde_appdir}/kde
-%define tde_tdedocdir %{tde_docdir}/tde
-%define tde_tdeincludedir %{tde_includedir}/tde
-%define tde_tdelibdir %{tde_libdir}/trinity
-
-%define _docdir %{tde_docdir}
-
-
-Name:			trinity-%{tde_pkg}
-Summary:		An apt-cache ioslave for Trinity
-Version:		0.13.2
-Release:		%{?!preversion:2}%{?preversion:1_%{preversion}}%{?dist}
-
-License:		GPLv2+
-Group:			Applications/Utilities
-
-Vendor:			Trinity Project
-Packager:		Francois Andriot <francois.andriot@free.fr>
-URL:			http://lpnotfr.free.fr/
-
-Prefix:			%{tde_prefix}
-BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
-
-Patch1:			tdeio-apt-3.5.13.2-ftbfs.patch
-
-BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
-BuildRequires:	trinity-arts-devel >= 1:1.5.10
-BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
-BuildRequires:	trinity-tdebase-devel >= %{tde_version}
-BuildRequires:	desktop-file-utils
-
-
-%description
-tdeio-apt is an ioslave which provides the apt:/ protocol. It
-integrates apt-cache functionalities into Konqueror, making
-browsing the packages easier. It provides:
- - apt-cache search: apt:/search?expression
- - apt-cache show: apt:/show?package . The show? target
-   prints the policy too.
- - apt-cache policy: apt:/policy?package
-
-
-%if 0%{?suse_version} || 0%{?pclinuxos}
-%debug_package
-%endif
-
-
-%prep
-%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
-%patch1 -p1 -b .ftbfs
-
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
-
-%build
-unset QTDIR; . /etc/profile.d/qt3.sh
-export PATH="%{tde_bindir}:${PATH}"
-
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
-  \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-final \
-  --enable-new-ldflags \
-  --enable-closure \
-  --enable-rpath
-
-%__make %{?_smp_mflags}
-
-
-%install
-export PATH="%{tde_bindir}:${PATH}"
-%__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
-
-%find_lang kio-apt
-
-
-%clean
-%__rm -rf %{buildroot}
-
-
-%files -f kio-apt.lang
-%defattr(-,root,root,-)
-%doc AUTHORS CHANGELOG ChangeLog COPYING
-%{tde_tdelibdir}/kio_apt.la
-%{tde_tdelibdir}/kio_apt.so
-%{tde_datadir}/apps/kio_apt/kdedeb_logo.png
-%{tde_datadir}/apps/kio_apt/kio_apt.css
-%{tde_datadir}/services/apt+http.protocol
-%{tde_datadir}/services/apt.protocol
-%{tde_datadir}/services/searchproviders/apt-file.desktop
-%{tde_datadir}/services/searchproviders/apt-files.desktop
-%{tde_datadir}/services/searchproviders/apt-search.desktop
-
-
-%changelog
diff --git a/redhat/applications/tdeio-apt/tdeio-apt-14.0.0.spec b/redhat/applications/tdeio-apt/tdeio-apt.spec
index c405bfa07..cd085ba18 100644
--- a/redhat/applications/tdeio-apt/tdeio-apt-14.0.0.spec
+++ b/redhat/applications/tdeio-apt/tdeio-apt.spec
@@ -18,7 +18,7 @@
 # TDE variables
 %define tde_epoch 2
 %if "%{?tde_version}" == ""
-%define tde_version 14.0.0
+%define tde_version 14.1.0
 %endif
 %define tde_pkg tdeio-apt
 %define tde_prefix /opt/trinity
@@ -60,11 +60,17 @@ BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
 BuildRequires:	trinity-tdebase-devel >= %{tde_version}
 BuildRequires:	desktop-file-utils
 
-BuildRequires:	autoconf automake libtool m4
+BuildRequires:	cmake >= 2.8
 BuildRequires:	gcc-c++
 BuildRequires:	pkgconfig
 BuildRequires:	fdupes
 
+# ACL support
+BuildRequires:	libacl-devel
+
+# IDN support
+BuildRequires:	libidn-devel
+
 # SUSE desktop files utility
 %if 0%{?suse_version}
 BuildRequires:	update-desktop-files
@@ -97,39 +103,43 @@ browsing the packages easier. It provides:
 %prep
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
 
-%__cp "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
-%__cp "/usr/share/libtool/"*"/ltmain.sh" "admin/ltmain.sh" || %__cp "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
-%__make -f "admin/Makefile.common"
-
 
 %build
 unset QTDIR QTINC QTLIB
 export PATH="%{tde_bindir}:${PATH}"
 
-%configure \
-  --prefix=%{tde_prefix} \
-  --exec-prefix=%{tde_prefix} \
-  --bindir=%{tde_bindir} \
-  --datadir=%{tde_datadir} \
-  --includedir=%{tde_tdeincludedir} \
-  --libdir=%{tde_libdir} \
-  --mandir=%{tde_mandir} \
+if ! rpm -E %%cmake|grep -q "cd build"; then
+  %__mkdir_p build
+  cd build
+fi
+
+%cmake \
+  -DCMAKE_BUILD_TYPE="RelWithDebInfo" \
+  -DCMAKE_C_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+  -DCMAKE_CXX_FLAGS="${RPM_OPT_FLAGS} -DNDEBUG" \
+  -DCMAKE_SKIP_RPATH=OFF \
+  -DCMAKE_INSTALL_RPATH="%{tde_libdir}" \
+  -DCMAKE_VERBOSE_MAKEFILE=ON \
+  -DWITH_GCC_VISIBILITY=OFF \
+  \
+  -DCMAKE_INSTALL_PREFIX="%{tde_prefix}" \
+  -DSHARE_INSTALL_PREFIX="%{tde_datadir}" \
+  -DLIB_INSTALL_DIR="%{tde_libdir}" \
+  \
+  -DWITH_ALL_OPTIONS=ON \
+  -DWITH_GCC_VISIBILITY=ON \
   \
-  --disable-dependency-tracking \
-  --disable-debug \
-  --enable-final \
-  --enable-new-ldflags \
-  --enable-closure \
-  --enable-rpath \
-  --disable-gcc-hidden-visibility
+  -DBUILD_ALL=ON \
+  -DBUILD_TRANSLATIONS=ON \
+  ..
 
-%__make %{?_smp_mflags}
+%__make %{?_smp_mflags} || %__make
 
 
 %install
 export PATH="%{tde_bindir}:${PATH}"
 %__rm -rf %{buildroot}
-%__make install DESTDIR=%{buildroot}
+%__make install DESTDIR=%{buildroot} -C build
 
 %find_lang %{tde_pkg}