RPM Packaging: some updates

pull/3/head
François Andriot 11 years ago
parent 8b0482ca98
commit a6addf0c3f

@ -123,42 +123,24 @@ done
%{tde_datadir}/apps/knmap/nmap_manpage.html %{tde_datadir}/apps/knmap/nmap_manpage.html
%{tde_datadir}/apps/knmap/nmap_manpage.html.diff %{tde_datadir}/apps/knmap/nmap_manpage.html.diff
%{tde_tdedocdir}/HTML/en/knmap/ %{tde_tdedocdir}/HTML/en/knmap/
%{tde_datadir}/icons/hicolor/16x16/apps/knmap.png %{tde_datadir}/icons/hicolor/*/apps/knmap.png
%{tde_datadir}/icons/hicolor/16x16/apps/knmapman.png %{tde_datadir}/icons/hicolor/*/apps/knmapman.png
%{tde_datadir}/icons/hicolor/16x16/apps/localman.png %{tde_datadir}/icons/hicolor/*/apps/localman.png
%{tde_datadir}/icons/hicolor/16x16/apps/manpage.png %{tde_datadir}/icons/hicolor/*/apps/manpage.png
%{tde_datadir}/icons/hicolor/16x16/apps/manstylesheet.png %{tde_datadir}/icons/hicolor/*/apps/manstylesheet.png
%{tde_datadir}/icons/hicolor/16x16/apps/profilecopy.png %{tde_datadir}/icons/hicolor/*/apps/profilecopy.png
%{tde_datadir}/icons/hicolor/16x16/apps/profiledelete.png %{tde_datadir}/icons/hicolor/*/apps/profiledelete.png
%{tde_datadir}/icons/hicolor/16x16/apps/profileload.png %{tde_datadir}/icons/hicolor/*/apps/profileload.png
%{tde_datadir}/icons/hicolor/16x16/apps/profilerename.png %{tde_datadir}/icons/hicolor/*/apps/profilerename.png
%{tde_datadir}/icons/hicolor/16x16/apps/profilesave.png %{tde_datadir}/icons/hicolor/*/apps/profilesave.png
%{tde_datadir}/icons/hicolor/16x16/apps/profilesaveas.png %{tde_datadir}/icons/hicolor/*/apps/profilesaveas.png
%{tde_datadir}/icons/hicolor/16x16/apps/scanclose.png %{tde_datadir}/icons/hicolor/*/apps/scanclose.png
%{tde_datadir}/icons/hicolor/16x16/apps/scanduplicate.png %{tde_datadir}/icons/hicolor/*/apps/scanduplicate.png
%{tde_datadir}/icons/hicolor/16x16/apps/scannew.png %{tde_datadir}/icons/hicolor/*/apps/scannew.png
%{tde_datadir}/icons/hicolor/16x16/apps/scanrename.png %{tde_datadir}/icons/hicolor/*/apps/scanrename.png
%{tde_datadir}/icons/hicolor/16x16/apps/zoomcustom.png %{tde_datadir}/icons/hicolor/*/apps/zoomcustom.png
%{tde_datadir}/icons/hicolor/16x16/apps/zoomin.png %{tde_datadir}/icons/hicolor/*/apps/zoomin.png
%{tde_datadir}/icons/hicolor/16x16/apps/zoomout.png %{tde_datadir}/icons/hicolor/*/apps/zoomout.png
%{tde_datadir}/icons/hicolor/32x32/apps/knmap.png
%{tde_datadir}/icons/hicolor/32x32/apps/knmapman.png
%{tde_datadir}/icons/hicolor/32x32/apps/localman.png
%{tde_datadir}/icons/hicolor/32x32/apps/manpage.png
%{tde_datadir}/icons/hicolor/32x32/apps/manstylesheet.png
%{tde_datadir}/icons/hicolor/32x32/apps/profilecopy.png
%{tde_datadir}/icons/hicolor/32x32/apps/profiledelete.png
%{tde_datadir}/icons/hicolor/32x32/apps/profileload.png
%{tde_datadir}/icons/hicolor/32x32/apps/profilerename.png
%{tde_datadir}/icons/hicolor/32x32/apps/profilesave.png
%{tde_datadir}/icons/hicolor/32x32/apps/profilesaveas.png
%{tde_datadir}/icons/hicolor/32x32/apps/scanclose.png
%{tde_datadir}/icons/hicolor/32x32/apps/scanduplicate.png
%{tde_datadir}/icons/hicolor/32x32/apps/scannew.png
%{tde_datadir}/icons/hicolor/32x32/apps/scanrename.png
%{tde_datadir}/icons/hicolor/32x32/apps/zoomcustom.png
%{tde_datadir}/icons/hicolor/32x32/apps/zoomin.png
%{tde_datadir}/icons/hicolor/32x32/apps/zoomout.png
%changelog %changelog

@ -42,7 +42,7 @@ Patch4: akode-2.0.2-gcc43.patch
# New patch for Fedora 16 / TDE 3.5.13 # New patch for Fedora 16 / TDE 3.5.13
Patch10: akode-autotools.patch Patch10: akode-autotools.patch
Patch11: akode-2.0.2-fix_ffmpeg_include.patch Patch11: akode-2.0.2-fix_ffmpeg_include.patch
Patch12: akode-2.0.2-fix_ftbfs.patch
# FLAC support # FLAC support
%define _with_flac --with-flac %define _with_flac --with-flac
@ -288,12 +288,7 @@ Requires: %{name} = %{version}-%{release}
%patch10 -p1 -b .autotools %patch10 -p1 -b .autotools
%patch11 -p1 -b .ffmpeg %patch11 -p1 -b .ffmpeg
%patch12 -p1 -b .ftbfs
# 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|%{tde_includedir}/tqt|g" \
-e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in" %__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" %__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"

@ -0,0 +1,20 @@
--- ./akode/lib/akodelib.h.ORI 2013-07-25 11:49:19.524457787 +0200
+++ ./akode/lib/akodelib.h 2013-07-25 11:49:23.056360414 +0200
@@ -34,13 +34,13 @@
#include <inttypes.h>
#else
typedef signed char int8_t;
-typedef unsigned char int8_t;
+typedef unsigned char uint8_t;
typedef signed short int16_t;
-typedef unsigned short int16_t;
+typedef unsigned short uint16_t;
typedef signed int int32_t;
typedef unsigned int uint32_t;
-typedef signed long long int64_t;
-typedef unsigned long long uint64_t;
+typedef signed long int64_t;
+typedef unsigned long uint64_t;
#endif
#endif

@ -255,10 +255,15 @@ BuildRequires: NetworkManager-glib-devel
%endif %endif
%endif %endif
# Certificates support
Requires: ca-certificates
# Trinity dependencies
Requires: trinity-tqt3 >= 3.5.0 Requires: trinity-tqt3 >= 3.5.0
Requires: trinity-tqtinterface >= %{tde_version} Requires: trinity-tqtinterface >= %{tde_version}
Requires: trinity-arts >= %{tde_version} Requires: trinity-arts >= %{tde_version}
%description %description
Libraries for the Trinity Desktop Environment: Libraries for the Trinity Desktop Environment:
TDE Libraries included: tdecore (TDE core library), kdeui (user interface), TDE Libraries included: tdecore (TDE core library), kdeui (user interface),
@ -435,7 +440,7 @@ applications for TDE.
unset QTDIR QTINC QTLIB unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}" export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig" export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
export CMAKE_INCLUDE_PATH="%{tde_includedir}:%{tde_includedir}/tqt" export CMAKE_INCLUDE_PATH="%{tde_includedir}"
# We need LD_LIBRARY_PATH here because ld.so.conf file has not been written yet # We need LD_LIBRARY_PATH here because ld.so.conf file has not been written yet
export LD_LIBRARY_PATH="%{tde_libdir}" export LD_LIBRARY_PATH="%{tde_libdir}"
@ -507,6 +512,10 @@ EOF
# Appends TDE version to '.pc' file # Appends TDE version to '.pc' file
echo "Version: %{version}" >>"%{?buildroot}%{tde_libdir}/pkgconfig/tdelibs.pc" echo "Version: %{version}" >>"%{?buildroot}%{tde_libdir}/pkgconfig/tdelibs.pc"
# Use system-wide CA certificate
%__rm -f "%{?buildroot}%{tde_datadir}/apps/kssl/ca-bundle.crt"
%__ln_s "%{_sysconfdir}/ssl/certs/ca-certificates.crt" "%{?buildroot}%{tde_datadir}/apps/kssl/ca-bundle.crt"
%clean %clean
%__rm -rf "%{?buildroot}" %__rm -rf "%{?buildroot}"

Loading…
Cancel
Save