RPM Packaging: update R14 packages

pull/3/head
François Andriot 11 years ago
parent f4d8002c33
commit 55bddf5886

@ -72,13 +72,13 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
# Specific path for RHEL4
if [ -d "/usr/X11R6" ]; then
export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
fi
%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
if ! rpm -E %%cmake|grep -q "cd build"; then
%__mkdir_p build
cd build
%endif
fi
%cmake \
-DCMAKE_BUILD_TYPE="RelWithDebInfo" \

@ -364,13 +364,13 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
# Specific path for RHEL4
if [ -d /usr/X11R6 ]; then
export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
fi
%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
if ! rpm -E %%cmake|grep -q "cd build"; then
%__mkdir_p build
cd build
%endif
fi
# Warning: GCC visibility causes FTBFS [Bug #1285]
%cmake \

@ -77,10 +77,10 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
if ! rpm -E %%cmake|grep -q "cd build"; then
%__mkdir_p build
cd build
%endif
fi
# Warning: GCC visibility causes the KCM not to work at all !
%cmake \

@ -68,7 +68,13 @@ Requires(postun): coreutils
Requires: %{name}-libs = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: %{name}-common = %{?epoch:%{epoch}:}%{version}-%{release}
Requires: cdrecord mkisofs
%if 0%{?suse_version} >= 1310
Requires: wodim
REquires: genisoimage
%else
Requires: cdrecord
REquires: mkisofs
%endif
Requires: dvd+rw-tools
# CDRDAO support

@ -82,14 +82,13 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
# Shitty hack for RHEL4 ...
if [ -d "/usr/X11R6" ]; then
export CMAKE_INCLUDE_PATH="${CMAKE_INCLUDE_PATH}:/usr/X11R6/include:/usr/X11R6/%{_lib}"
export CFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
fi
%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
if ! rpm -E %%cmake|grep -q "cd build"; then
%__mkdir_p build
cd build
%endif
fi
%cmake \
-DCMAKE_BUILD_TYPE="RelWithDebInfo" \
@ -111,6 +110,7 @@ cd build
\
-DUSE_STRIGI=OFF \
-DUSE_MENUDRAKE=OFF \
-DBUILD_DOC=ON \
-DBUILD_ALL=ON \
..

@ -50,6 +50,7 @@ BuildRequires: desktop-file-utils
BuildRequires: gtk2-devel
# DBUS stuff
%if 0%{?suse_version}
BuildRequires: dbus-1-glib-devel
%else

@ -127,10 +127,10 @@ This package provides the data files necessary for running Rosegarden
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
if ! rpm -E %%cmake|grep -q "cd build"; then
%__mkdir_p build
cd build
%endif
fi
%cmake \
-DCMAKE_BUILD_TYPE="RelWithDebInfo" \

@ -76,13 +76,10 @@ gtk2-engines-qtcurve.
unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export CXXFLAGS="-I${QTINC} -I%{tde_tdeincludedir} ${CXXFLAGS}"
# Shitty hack for RHEL4 ...
if [ -d "/usr/X11R6" ]; then
export CMAKE_INCLUDE_PATH="${CMAKE_INCLUDE_PATH}:/usr/X11R6/include:/usr/X11R6/%{_lib}"
export CFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
fi
# Error in "po/tr.po"
@ -90,10 +87,10 @@ fi
%__rm -f "po/tr.po"
%endif
%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
if ! rpm -E %%cmake|grep -q "cd build"; then
%__mkdir_p build
cd build
%endif
fi
%cmake \
-DCMAKE_BUILD_TYPE="RelWithDebInfo" \

@ -75,10 +75,10 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
if ! rpm -E %%cmake|grep -q "cd build"; then
%__mkdir_p build
cd build
%endif
fi
%cmake \
-DCMAKE_BUILD_TYPE="RelWithDebInfo" \

@ -0,0 +1,123 @@
# 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
# Default version for this component
%define tde_pkg tdeio-sword
%define tde_version 14.0.0
# 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_tdeappdir %{tde_datadir}/applications/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}
Version: 0.3
Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant}
Summary: tdeio-slave for the Sword Bible tool
Group: Productivity/Networking/Ftp/Clients
License: GPLv2+
URL: http://lukeplant.me.uk/kio-sword/
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
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
BuildRequires: gettext
%description
TDEio-Sword provides access to Bibles, commentaries
and other texts in an easy to use and attractive
interface -- the Konqueror web browser. It does so
using the SWORD Bible project and implementing a TDE
ioslave, providing the sword:/ protocol.
%if 0%{?suse_version} || 0%{?pclinuxos}
%debug_package
%endif
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%__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"
%__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} \
--libdir=%{tde_libdir} \
--datadir=%{tde_datadir} \
\
--disable-dependency-tracking \
--disable-debug \
--enable-final \
--enable-new-ldflags \
--enable-closure \
--enable-rpath \
--enable-gcc-hidden-visibility
%__make %{?_smp_mflags}
%install
%__rm -rf %{?buildroot}
%__make install DESTDIR=%{buildroot}
%post
for f in hicolor ; do
touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || :
done
%postun
for f in hicolor ; do
touch --no-create %{tde_datadir}/icons/${f} 2> /dev/null || :
gtk-update-icon-cache --quiet %{tde_datadir}/icons/${f} 2> /dev/null || :
done
%files
%defattr(-,root,root,-)
%doc AUTHORS ChangeLog COPYING README TODO
%{tde_tdelibdir}/tdeio_sword.la
%{tde_tdelibdir}/tdeio_sword.so
%{tde_datadir}/apps/tdeio_sword/swordvertical.png
%{tde_datadir}/apps/tdeio_sword/tdeio_sword.css
%{tde_tdedocdir}/HTML/en/tdeio_sword/
%{tde_datadir}/icons/hicolor/*/apps/tdeio_sword.png
%{tde_datadir}/icons/hicolor/scalable/apps/tdeio_sword.svgz
%{tde_datadir}/services/sword.protocol
%changelog
* Fri Jul 05 2013 Francois Andriot <francois.andriot@free.fr> - 0.3-1
- Initial release for TDE 14.0.0

@ -98,10 +98,10 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
if ! rpm -E %%cmake|grep -q "cd build"; then
%__mkdir_p build
cd build
%endif
fi
%cmake \
-DCMAKE_BUILD_TYPE="RelWithDebInfo" \

@ -94,10 +94,10 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${PATH}"
export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
if ! rpm -E %%cmake|grep -q "cd build"; then
%__mkdir_p build
cd build
%endif
fi
%cmake \
-DCMAKE_BUILD_TYPE="RelWithDebInfo" \

@ -122,10 +122,10 @@ unset QTDIR QTINC QTLIB
export PATH="%{tde_bindir}:${QTDIR}/bin:${PATH}"
export CMAKE_INCLUDE_PATH="%{tde_tdeincludedir}"
%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
if ! rpm -E %%cmake|grep -q "cd build"; then
%__mkdir_p build
cd build
%endif
fi
%cmake \
-DCMAKE_BUILD_TYPE="RelWithDebInfo" \

@ -77,14 +77,13 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig"
# Shitty hack for RHEL4 ...
if [ -d "/usr/X11R6" ]; then
export CMAKE_INCLUDE_PATH="${CMAKE_INCLUDE_PATH}:/usr/X11R6/include:/usr/X11R6/%{_lib}"
export CFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
fi
%if 0%{?rhel} || 0%{?fedora} || 0%{?suse_version}
if ! rpm -E %%cmake|grep -q "cd build"; then
%__mkdir_p build
cd build
%endif
fi
%cmake \
-DCMAKE_BUILD_TYPE="RelWithDebInfo" \

@ -256,15 +256,15 @@ applications, as well as the README files for TQt 3.
%{tde_libdir}/libtqui.so.1
%{tde_libdir}/libtqui.so.1.0
%{tde_libdir}/libtqui.so.1.0.0
%{tde_libdir}/libdesignercore.so.1
%{tde_libdir}/libdesignercore.so.1.0
%{tde_libdir}/libdesignercore.so.1.0.0
%{tde_libdir}/libeditor.so.1
%{tde_libdir}/libeditor.so.1.0
%{tde_libdir}/libeditor.so.1.0.0
%{tde_libdir}/libqassistantclient.so.1
%{tde_libdir}/libqassistantclient.so.1.0
%{tde_libdir}/libqassistantclient.so.1.0.0
%{tde_libdir}/libtqtdesignercore.so.1
%{tde_libdir}/libtqtdesignercore.so.1.0
%{tde_libdir}/libtqtdesignercore.so.1.0.0
%{tde_libdir}/libtqteditor.so.1
%{tde_libdir}/libtqteditor.so.1.0
%{tde_libdir}/libtqteditor.so.1.0.0
%{tde_libdir}/libtqassistantclient.so.1
%{tde_libdir}/libtqassistantclient.so.1.0
%{tde_libdir}/libtqassistantclient.so.1.0.0
##########
@ -326,12 +326,12 @@ toolkit.
%{tde_datadir}/tqt3/mkspecs/
%{tde_datadir}/tqt3/phrasebooks/
%{tde_includedir}/tqt3/
%{tde_libdir}/libdesignercore.prl
%{tde_libdir}/libdesignercore.so
%{tde_libdir}/libeditor.prl
%{tde_libdir}/libeditor.so
%{tde_libdir}/libqassistantclient.prl
%{tde_libdir}/libqassistantclient.so
%{tde_libdir}/libtqtdesignercore.prl
%{tde_libdir}/libtqtdesignercore.so
%{tde_libdir}/libtqteditor.prl
%{tde_libdir}/libtqteditor.so
%{tde_libdir}/libtqassistantclient.prl
%{tde_libdir}/libtqassistantclient.so
%{tde_libdir}/libtqt-mt.so
%{tde_libdir}/libtqt-mt.prl
%{tde_libdir}/libtqui.so

@ -74,8 +74,6 @@ Trinity QT Interface
%{tde_bindir}/tqt-replace
%{tde_bindir}/tqt-replace-stream
%{tde_bindir}/uic-tqt
%{tde_libdir}/libtqassistantclient.so.4
%{tde_libdir}/libtqassistantclient.so.4.2.0
%{tde_libdir}/libtqt.so.4
%{tde_libdir}/libtqt.so.4.2.0
@ -102,8 +100,6 @@ Development files for %{name}
%files devel
%defattr(-,root,root,-)
%{tde_includedir}/tqt/
%{tde_libdir}/libtqassistantclient.la
%{tde_libdir}/libtqassistantclient.so
%{tde_libdir}/libtqt.la
%{tde_libdir}/libtqt.so
%{tde_libdir}/pkgconfig/tqt.pc
@ -116,10 +112,12 @@ Development files for %{name}
%debug_package
%endif
##########
%prep
%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
%build
unset QTDIR QTINC QTLIB
@ -154,20 +152,13 @@ fi
-DUSE_QT3="ON" \
..
%__make %{?_smp_mflags}
%__make %{?_smp_mflags} || %__make
%install
%__rm -rf %{?buildroot}
%__make install DESTDIR=%{?buildroot} -C build
# RHEL 5: add newline at end of include files to avoid warnings
%if 0%{?rhel} && 0%{?rhel} <= 5
for i in %{?buildroot}%{tde_includedir}/tqt/*.h; do
echo "" >>${i}
done
%endif
# Install 'cmake' modules for development use
%__mkdir_p %{?buildroot}%{cmake_modules_dir}
for i in cmake/modules/*.cmake; do

@ -43,6 +43,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
Patch0: python-trinity-14.0.0-ftbfs.patch
Patch1: python-trinity-14.0.0-ftbfs2.patch
BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version}
@ -113,6 +116,10 @@ tips and working code you can use to learn from.
%prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%if 0%{?suse_version} == 1310
%patch0 -p1 -b .ftbfs
#patch1 -p1 -b .ftbfs
%endif
%build
@ -127,7 +134,7 @@ export DH_OPTIONS
-L %{_lib} \
-v %{_datadir}/sip/trinity
%__make %{_smp_mflags}
%__make %{_smp_mflags} || %__make
%install

@ -1618,7 +1618,7 @@ diff -Nuar tde-i18n-fr.ORI/messages/tdebase/tdeio_media.po tde-i18n-fr/messages/
diff -Nuar tde-i18n-fr.ORI/messages/tdebase/tderandr.po tde-i18n-fr/messages/tdebase/tderandr.po
--- tde-i18n-fr.ORI/messages/tdebase/tderandr.po 2013-07-26 17:53:39.995658788 +0200
+++ tde-i18n-fr/messages/tdebase/tderandr.po 2013-07-26 17:53:58.998152466 +0200
@@ -301,3 +301,54 @@
@@ -301,3 +301,55 @@
"_: Refresh rate in Hertz (Hz)\n"
"%1 Hz"
msgstr "%1 Hz"
@ -1671,7 +1671,6 @@ diff -Nuar tde-i18n-fr.ORI/messages/tdebase/tderandr.po tde-i18n-fr/messages/tde
+msgid "Next available output"
+msgstr "Sortie Vidéo suivante"
+
+#, c-format
+msgid "%1 (Active)"
+msgstr "%1 (Active)"
+

@ -719,7 +719,7 @@ for l in %{TDE_LANGS}; do
--prefix=%{tde_prefix} \
--datadir=%{tde_datadir} \
--docdir=%{tde_tdedocdir}
%__make %{?_smp_mflags}
%__make %{?_smp_mflags} || %__make || echo Error
) &
sleep 3
popd
@ -736,6 +736,7 @@ fi
wait
rm -f /tmp/rpmbuild.$$
%install
%__rm -rf %{?buildroot}
export PATH="%{tde_bindir}:${PATH}"
@ -748,6 +749,7 @@ for l in %{TDE_LANGS}; do
done
done
# make symlinks relative
%if "%{tde_prefix}" == "/usr"
pushd "%{buildroot}%{tde_tdedocdir}/HTML"

@ -638,15 +638,18 @@ This package is part of Trinity, and a component of the TDE artwork module.
%{tde_datadir}/applnk/System/ScreenSavers/tronbit.desktop
%endif
%if 0%{?fedora} >= 19
%if 0%{?fedora} >= 15 || 0%{?pclinuxos}
%{tde_datadir}/applnk/System/ScreenSavers/companioncube.desktop
%{tde_datadir}/applnk/System/ScreenSavers/hexadrop.desktop
%{tde_datadir}/applnk/System/ScreenSavers/hilbert.desktop
%{tde_datadir}/applnk/System/ScreenSavers/kaleidocycle.desktop
%{tde_datadir}/applnk/System/ScreenSavers/quasicrystal.desktop
%{tde_datadir}/applnk/System/ScreenSavers/rubikblocks.desktop
%{tde_datadir}/applnk/System/ScreenSavers/surfaces.desktop
%{tde_datadir}/applnk/System/ScreenSavers/tronbit.desktop
%endif
%if 0%{?fedora} >= 18 || 0%{?pclinuxos}
%{tde_datadir}/applnk/System/ScreenSavers/hexadrop.desktop
%{tde_datadir}/applnk/System/ScreenSavers/kaleidocycle.desktop
%{tde_datadir}/applnk/System/ScreenSavers/quasicrystal.desktop
%{tde_datadir}/applnk/System/ScreenSavers/unknownpleasures.desktop
%endif

@ -323,7 +323,12 @@ BuildRequires: glib2-devel
BuildRequires: pcre-devel
# SASL support
%if 0%{?mageia} || 0%{?mandriva} || 0%{?pclinuxos}
BuildRequires: %{_lib}sasl2-devel
%endif
%if 0%{?suse_version}
BuildRequires: cyrus-sasl-devel
%endif
# LIBUSB support
BuildRequires: pam-devel
@ -1997,6 +2002,7 @@ Provides: service(graphical-login)
# Required for Mandriva's installer
%if 0%{?mgaversion} || 0%{?mdkversion}
Provides: dm
Provides: tdm
%endif
%description -n trinity-tdm
@ -3026,7 +3032,7 @@ ktip provides many useful tips on using TDE when you log in.
%{tde_tdeappdir}/ktip.desktop
%{tde_datadir}/applnk/Toys/ktip.desktop
%{tde_datadir}/apps/kdewizard/pics/wizard_small.png
%{tde_datadir}/apps/kdewizard/tips/
%{tde_datadir}/apps/kdewizard/tips
%{tde_datadir}/autostart/ktip.desktop
%{tde_datadir}/icons/hicolor/*/apps/ktip.*
@ -3489,6 +3495,7 @@ EOF
# Fedora 18: no more SYSV init script, we have to use systemd.
%if 0%{?fedora} >= 18
%__install -D -m 644 "%{SOURCE7}" "%{?buildroot}/usr/lib/systemd/system/tdm.service"
%__sed -i "s|kdm|tdm|g" "%{?buildroot}/usr/lib/systemd/system/tdm.service"
%endif
# Symlink TDM configuration

@ -1535,7 +1535,7 @@ export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
# Specific path for RHEL4
if [ -d "/usr/X11R6" ]; then
export CXXFLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
fi
%configure \

@ -130,7 +130,11 @@ Requires: udisks
# UDISKS2 support
%if 0%{?fedora} || 0%{?mdkversion} || 0%{?mgaversion} || 0%{?suse_version}
%define with_udisks2 1
%if 0%{?fedora} >= 20
BuildRequires: libudisks2-devel
%else
BuildRequires: udisks2-devel
%endif
Requires: udisks2
%endif

Loading…
Cancel
Save