TDE
/
tde-packaging
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/tde-packaging
1
0
Fork 0
Code Issues Releases Wiki Activity

RPM Packaging: update R14 packages

Browse Source
pull/3/head
François Andriot 10 years ago
parent 2bccc67f69
commit 693e9a10c0
12 changed files with 140 additions and 28 deletions
Show Stats Download Patch File Download Diff File

27
redhat/applications/bibletime/bibletime-14.0.0-ftbfs.patch
Unescape View File

@ -0,0 +1,27 @@
--- ./bibletime/backend/clanguagemgr.cpp.ORI 2014-02-23 21:50:05.169018790 +0100
+++ ./bibletime/backend/clanguagemgr.cpp 2014-02-23 21:55:06.105229001 +0100
@@ -95,10 +95,10 @@
for (ListCSwordModuleInfo::iterator it(mods.begin()); it != end_it; ++it) {
// for (CSwordModuleInfo* m = mods.first(); m; m = mods.next()) {
- abbrev = (*it)->module()->Lang();
+ const char* mod = (*it)->module()->Lang();
- if (abbrev && !abbrevs.contains(abbrev)) {
- abbrevs.append( abbrev );
+ if (mod && !abbrevs.contains(mod)) {
+ abbrevs.append( mod );
}
};
--- ./sword.m4.ori 2014-02-23 22:31:45.119410870 +0100
+++ ./sword.m4 2014-02-23 22:32:45.468246504 +0100
@@ -28,7 +28,7 @@
dnl try to find Sword library files
AC_MSG_CHECKING([for Sword library files])
AC_REQUIRE([AC_FIND_ZLIB])
-ac_sword_library_dirs="$ac_sword_dir/lib $exec_prefix/lib $prefix/lib /usr/lib /usr/lib64 /usr/lib/sword /usr/local/lib /usr/local/lib/sword /usr/local/sword/lib"
+ac_sword_library_dirs="$ac_sword_dir/lib64 $ac_sword_dir/lib $exec_prefix/lib $prefix/lib64 $prefix/lib /usr/lib /usr/lib64 /usr/lib/sword /usr/local/lib /usr/local/lib/sword /usr/local/sword/lib"
if test "x$ac_static_sword" = "xYES"; then
SEARCH_LIBS="libsword.a";

2
redhat/applications/bibletime/bibletime-14.0.0.spec
Unescape View File

@ -55,7 +55,7 @@ BuildRequires: clucene-core-devel
%endif %endif
%if 0%{?mgaversion} || 0%{?mdkversion} %if 0%{?mgaversion} || 0%{?mdkversion}
%if 0%{?pclinuxos} %if 0%{?pclinuxos}
BuildRequires: %{_lib}clucene2-devel BuildRequires: %{_lib}clucene-devel
%else %else
BuildRequires: %{_lib}clucene-devel BuildRequires: %{_lib}clucene-devel
%endif %endif

13
redhat/applications/kasablanca/kasablanca-14.0.0-fix_ftp.patch
Unescape View File

@ -0,0 +1,13 @@
--- trinity-kasablanca-14.0.0~pre22+07aa7379/src/ftpthread.cpp.ORI 2014-02-19 22:52:20.875005485 +0100
+++ trinity-kasablanca-14.0.0~pre22+07aa7379/src/ftpthread.cpp 2014-02-19 22:53:01.488995960 +0100
@@ -1094,8 +1094,8 @@
bool FtpThread::FormatFilelist(const char *filename, TQString current, filist *dirtable, filist *filetable)
{
- int i, blocks, space, month_int = 1;
- unsigned int loc, fileloc, datebegin, sizebegin = 0;
+ int i, blocks, space, month_int = 1, loc;
+ unsigned int fileloc, datebegin, sizebegin = 0;
string buffer, filestring;
FILE* dirfile;

7
redhat/applications/kmplayer/kmplayer-14.0.0.spec
Unescape View File

@ -63,14 +63,14 @@ BuildRequires: %{_lib}gstreamer-plugins-base0.10-devel
%endif %endif
%if 0%{?rhel} == 4 %if 0%{?rhel} == 4
BuildRequires: gstreamer-devel BuildRequires: gstreamer-devel
BuildRequires: gstreamer-plugins-devel #BuildRequires: gstreamer-plugins-devel
%endif %endif
%if 0%{?rhel} >= 5 || 0%{?fedora} %if 0%{?rhel} >= 5 || 0%{?fedora}
BuildRequires: gstreamer-devel BuildRequires: gstreamer-devel
BuildRequires: gstreamer-plugins-base-devel BuildRequires: gstreamer-plugins-base-devel
%endif %endif
%if 0%{?suse_version} %if 0%{?suse_version}
BuildRequires: gstreamer-devel BuildRequires: gstreamer-0_10-devel
BuildRequires: gstreamer-0_10-plugins-base-devel BuildRequires: gstreamer-0_10-plugins-base-devel
%endif %endif
@ -94,6 +94,7 @@ BuildRequires: libxine-devel
# X11 stuff # X11 stuff
%if 0%{?mgaversion} || 0%{?mdkversion} %if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: libxt-devel
BuildRequires: libxv-devel BuildRequires: libxv-devel
%endif %endif
%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1210 %if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1210
@ -200,7 +201,7 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
--enable-rpath \ --enable-rpath \
--disable-gcc-hidden-visibility --disable-gcc-hidden-visibility
%__make %{?_smp_mflags} %__make %{?_smp_mflags} || %__make
%install %install

3
redhat/applications/koffice-i18n/koffice-i18n-14.0.0.spec
Unescape View File

@ -53,6 +53,8 @@ AutoReq: no
Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
Patch0: koffice-i18n-14.0.0-ftbfs.patch
BuildRequires: trinity-tqtinterface-devel >= %{tde_version} BuildRequires: trinity-tqtinterface-devel >= %{tde_version}
BuildRequires: trinity-arts-devel >= 1:1.5.10 BuildRequires: trinity-arts-devel >= 1:1.5.10
BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdelibs-devel >= %{tde_version}
@ -546,6 +548,7 @@ Provides: %{name}-tz_TW = %{version}-%{release}
%prep %prep
%setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
%patch0 -p1 -b .ftbfs
%__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"

2
redhat/libraries/libksquirrel/libksquirrel-14.0.0.spec
Unescape View File

@ -61,7 +61,7 @@ BuildRequires: libungif-devel
%endif %endif
# DJVU support # DJVU support
%if 0%{?fedora} || 0%{?rhel} >= 5 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version} %if 0%{?fedora} || 0%{?rhel} >= 6 || 0%{?mgaversion} || 0%{?mdkversion} || 0%{?suse_version}
%define with_djvu 1 %define with_djvu 1
BuildRequires: djvulibre BuildRequires: djvulibre
%endif %endif

13
redhat/tdeaccessibility/tdeaccessibility-14.0.0.spec
Unescape View File

@ -56,8 +56,10 @@ BuildRequires: libXtst-devel
BuildRequires: libxcb-devel BuildRequires: libxcb-devel
%endif %endif
%if 0%{?mgaversion} || 0%{?mdkversion} %if 0%{?mgaversion} || 0%{?mdkversion}
%if 0%{?pclinuxos} == 0
BuildRequires: %{_lib}xcb-devel BuildRequires: %{_lib}xcb-devel
%endif %endif
%endif
# X11 stuff # X11 stuff
%if 0%{?mgaversion} || 0%{?mdkversion} %if 0%{?mgaversion} || 0%{?mdkversion}
@ -156,7 +158,7 @@ Summary: A screen magnifier for TDE
Group: User Interface/Desktops Group: User Interface/Desktops
%description -n trinity-kmag %description -n trinity-kmag
KDE's screen magnifier tool. TDE's screen magnifier tool.
You can use KMagnifier to magnify a part of the screen just as you would use You can use KMagnifier to magnify a part of the screen just as you would use
a lens to magnify a newspaper fine-print or a photograph. This application is a lens to magnify a newspaper fine-print or a photograph. This application is
@ -377,8 +379,8 @@ Homepage: http://accessibility.kde.org/developer/kttsd
%{tde_datadir}/servicetypes/kttsd_audioplugin.desktop %{tde_datadir}/servicetypes/kttsd_audioplugin.desktop
%{tde_datadir}/servicetypes/kttsd_filterplugin.desktop %{tde_datadir}/servicetypes/kttsd_filterplugin.desktop
%{tde_datadir}/servicetypes/kttsd_synthplugin.desktop %{tde_datadir}/servicetypes/kttsd_synthplugin.desktop
%{tde_datadir}/icons/crystalsvg/*/apps/kttsd.png #%{tde_datadir}/icons/crystalsvg/*/apps/kttsd.png
%{tde_datadir}/icons/crystalsvg/*/apps/kttsd.svgz #%{tde_datadir}/icons/crystalsvg/*/apps/kttsd.svgz
%{tde_tdedocdir}/HTML/en/kttsd/ %{tde_tdedocdir}/HTML/en/kttsd/
%post -n trinity-kttsd %post -n trinity-kttsd
@ -503,6 +505,11 @@ export PATH="%{tde_bindir}:${PATH}"
%__rm -rf %{buildroot} %__rm -rf %{buildroot}
%__make install DESTDIR=%{buildroot} %__make install DESTDIR=%{buildroot}
# Avoid conflict with tdelibs
%__rm -f %{?buildroot}%{tde_datadir}/icons/crystalsvg/*/apps/kttsd.png
%__rm -f %{?buildroot}%{tde_datadir}/icons/crystalsvg/scalable/apps/kttsd.svgz
if [ -x /usr/bin/optimizegraphics ]; then if [ -x /usr/bin/optimizegraphics ]; then
(cd %{?buildroot} && /usr/bin/optimizegraphics) (cd %{?buildroot} && /usr/bin/optimizegraphics)
fi fi

65
redhat/tdebase/tdebase-14.0.0.spec
Unescape View File

@ -472,7 +472,51 @@ BuildRequires: xorg-x11-libxkbfile-devel
BuildRequires: libxkbfile-devel BuildRequires: libxkbfile-devel
%endif %endif
# X11 stuff ... # XDMCP support
%if 0%{?mgaversion} || 0%{?mdkversion}
%if 0%{?mgaversion} >= 4
BuildRequires: %{_lib}xdmcp-devel
%else
BuildRequires: %{_lib}xdmcp%{?mgaversion:6}-devel
%endif
%endif
%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220
BuildRequires: libXdmcp-devel
%endif
# XTST support
%if 0%{?mgaversion} || 0%{?mdkversion}
%if 0%{?mgaversion} >= 4
BuildRequires: %{_lib}xtst-devel
%else
BuildRequires: %{_lib}xtst%{?mgaversion:6}-devel
%endif
%endif
%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220
BuildRequires: libXtst-devel
%endif
# XDAMAGE support
%if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: %{_lib}xdamage-devel
%endif
%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220
BuildRequires: libXdamage-devel
%endif
# XCOMPOSITE support
%if 0%{?mgaversion} || 0%{?mdkversion}
%if 0%{?mgaversion} >= 4
BuildRequires: %{_lib}xcomposite-devel
%else
BuildRequires: %{_lib}xcomposite%{?mgaversion:1}-devel
%endif
%endif
%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220
BuildRequires: libXcomposite-devel
%endif
# Other X11 stuff ...
%if 0%{?rhel} == 4 %if 0%{?rhel} == 4
BuildRequires: xorg-x11-devel BuildRequires: xorg-x11-devel
%endif %endif
@ -486,25 +530,11 @@ BuildRequires: libfontenc-devel
%endif %endif
%if 0%{?mgaversion} || 0%{?mdkversion} %if 0%{?mgaversion} || 0%{?mdkversion}
BuildRequires: %{_lib}xdamage-devel
%if 0%{?mgaversion} >= 4
BuildRequires: %{_lib}xcomposite-devel
BuildRequires: %{_lib}xdmcp-devel
BuildRequires: %{_lib}xtst-devel
%else
BuildRequires: %{_lib}xcomposite%{?mgaversion:1}-devel
BuildRequires: %{_lib}xdmcp%{?mgaversion:6}-devel
BuildRequires: %{_lib}xtst%{?mgaversion:6}-devel
%endif
BuildRequires: x11-font-util BuildRequires: x11-font-util
BuildRequires: x11-proto-devel BuildRequires: x11-proto-devel
%endif %endif
%if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220 %if 0%{?rhel} >= 5 || 0%{?fedora} || 0%{?suse_version} >= 1220
BuildRequires: libXcomposite-devel
BuildRequires: libXdamage-devel
BuildRequires: libXdmcp-devel
BuildRequires: libXtst-devel
BuildRequires: xorg-x11-proto-devel BuildRequires: xorg-x11-proto-devel
%endif %endif
@ -521,6 +551,9 @@ BuildRequires: bdftopcf
BuildRequires: drakconf BuildRequires: drakconf
%endif %endif
# Needed for "compton" stuff
BuildRequires: libconfig-devel
# tdebase is a metapackage that installs all sub-packages # tdebase is a metapackage that installs all sub-packages
Requires: %{name}-runtime-data-common = %{version}-%{release} Requires: %{name}-runtime-data-common = %{version}-%{release}
Requires: %{name}-data = %{version}-%{release} Requires: %{name}-data = %{version}-%{release}
@ -1213,6 +1246,7 @@ TDE applications, particularly those in the TDE base module.
%attr(4511,root,root) %{tde_bindir}/tdmtsak %attr(4511,root,root) %{tde_bindir}/tdmtsak
%{tde_bindir}/tsak %{tde_bindir}/tsak
%endif %endif
%{tde_bindir}/compton-tde
%{tde_bindir}/tdedebugdialog %{tde_bindir}/tdedebugdialog
%{tde_bindir}/kreadconfig %{tde_bindir}/kreadconfig
%{tde_bindir}/kwriteconfig %{tde_bindir}/kwriteconfig
@ -3416,6 +3450,7 @@ fi
-DWITH_SENSORS=ON \ -DWITH_SENSORS=ON \
-DWITH_HAL=OFF \ -DWITH_HAL=OFF \
-DWITH_TDEHWLIB=ON \ -DWITH_TDEHWLIB=ON \
-DWITH_ELFICON=OFF \
-DWITH_UPOWER=ON \ -DWITH_UPOWER=ON \
\ \
-DBUILD_ALL=ON \ -DBUILD_ALL=ON \

19
redhat/tdebindings/tdebindings-14.0.0.spec
Unescape View File

@ -123,8 +123,18 @@ BuildRequires: python-devel
## ruby ## ruby
BuildRequires: ruby-devel >= 1.8, ruby BuildRequires: ruby-devel >= 1.8, ruby
%if "%{?ruby_libarchdir}" != ""
%define ruby_arch %{?ruby_libarchdir}
%else
%{!?ruby_arch: %define ruby_arch %(ruby -rrbconfig -e 'puts Config::CONFIG["archdir"]')} %{!?ruby_arch: %define ruby_arch %(ruby -rrbconfig -e 'puts Config::CONFIG["archdir"]')}
%endif
%if "%{?ruby_libdir}" != ""
%define ruby_rubylibdir %{?ruby_libdir}
%else
%{!?ruby_rubylibdir: %define ruby_rubylibdir %(ruby -rrbconfig -e 'puts Config::CONFIG["rubylibdir"]')} %{!?ruby_rubylibdir: %define ruby_rubylibdir %(ruby -rrbconfig -e 'puts Config::CONFIG["rubylibdir"]')}
%endif
# Ruby 1.9 includes are located in strance directories ... (taken from ruby 1.9 spec file) # Ruby 1.9 includes are located in strance directories ... (taken from ruby 1.9 spec file)
%global _normalized_cpu %(echo %{_target_cpu} | sed 's/^ppc/powerpc/;s/i.86/i386/;s/sparcv./sparc/;s/armv.*/arm/') %global _normalized_cpu %(echo %{_target_cpu} | sed 's/^ppc/powerpc/;s/i.86/i386/;s/sparcv./sparc/;s/armv.*/arm/')
@ -980,6 +990,10 @@ Development files for the TDE bindings.
%setup -q -n %{name}-%{version}%{?preversion:~%{preversion}} %setup -q -n %{name}-%{version}%{?preversion:~%{preversion}}
%patch1 -p1 -b .ftbfs %patch1 -p1 -b .ftbfs
%if "%{?perl_vendorarch}" == ""
exit 1
%endif
%if 0%{?rhel} >= 4 && 0%{?rhel} <= 5 %if 0%{?rhel} >= 4 && 0%{?rhel} <= 5
%patch5 -p1 -b .ruby %patch5 -p1 -b .ruby
%endif %endif
@ -1018,6 +1032,11 @@ if [ -d /usr/evolution28 ]; then
export PKG_CONFIG_PATH="/usr/evolution28/%{_lib}/pkgconfig:${PKG_CONFIG_PATH}" export PKG_CONFIG_PATH="/usr/evolution28/%{_lib}/pkgconfig:${PKG_CONFIG_PATH}"
fi fi
# Warning: openSUSE 13.1: /usr/include/ruby-2.0.0/ruby.h
%if 0%{?suse_version} >= 1310
EXTRA_INCLUDES="/usr/include/ruby-%{rb20_ver}:/usr/include/ruby-%{rb20_ver}/%{_target}"
%endif
# Warning: GCC visibility causes FTBFS [Bug #1285] # Warning: GCC visibility causes FTBFS [Bug #1285]
%configure \ %configure \
--prefix=%{tde_prefix} \ --prefix=%{tde_prefix} \

2
redhat/tdegraphics/tdegraphics-14.0.0.spec
Unescape View File

@ -1284,7 +1284,7 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
# Specific path for RHEL4 # Specific path for RHEL4
if [ -d /usr/X11R6 ]; then 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 fi
if ! rpm -E %%cmake|grep -q "cd build"; then if ! rpm -E %%cmake|grep -q "cd build"; then

8
redhat/tdenetwork/tdenetwork-14.0.0.spec
Unescape View File

@ -292,8 +292,8 @@ development-related files for the TDE network module.
%{tde_libdir}/libtdeinit_ksirc.la %{tde_libdir}/libtdeinit_ksirc.la
%{tde_libdir}/libkopete.la %{tde_libdir}/libkopete.la
%{tde_libdir}/libkopete.so %{tde_libdir}/libkopete.so
%{tde_libdir}/libkopete_msn_shared.la #%{tde_libdir}/libkopete_msn_shared.la
%{tde_libdir}/libkopete_msn_shared.so #%{tde_libdir}/libkopete_msn_shared.so
%{tde_libdir}/libkopete_oscar.la %{tde_libdir}/libkopete_oscar.la
%{tde_libdir}/libkopete_oscar.so %{tde_libdir}/libkopete_oscar.so
%{tde_libdir}/libkopete_videodevice.la %{tde_libdir}/libkopete_videodevice.la
@ -509,7 +509,7 @@ URL: http://kopete.kde.org
%description -n trinity-kopete %description -n trinity-kopete
Kopete is an instant messenger program which can communicate with a variety Kopete is an instant messenger program which can communicate with a variety
of IM systems, such as Yahoo, ICQ, MSN, IRC and Jabber. of IM systems, such as Yahoo, ICQ, IRC and Jabber.
Support for more IM protocols can be added through a plugin system. Support for more IM protocols can be added through a plugin system.
@ -536,7 +536,7 @@ Support for more IM protocols can be added through a plugin system.
%{tde_tdelibdir}/kopete_*.so %{tde_tdelibdir}/kopete_*.so
%{tde_tdelibdir}/libkrichtexteditpart.la %{tde_tdelibdir}/libkrichtexteditpart.la
%{tde_tdelibdir}/libkrichtexteditpart.so %{tde_tdelibdir}/libkrichtexteditpart.so
%{tde_libdir}/libkopete_msn_shared.so.* #%{tde_libdir}/libkopete_msn_shared.so.*
%{tde_libdir}/libkopete_oscar.so.* %{tde_libdir}/libkopete_oscar.so.*
%{tde_libdir}/libkopete.so.* %{tde_libdir}/libkopete.so.*
%{tde_libdir}/libkopete_videodevice.so.* %{tde_libdir}/libkopete_videodevice.so.*

7
redhat/tdepim/tdepim-14.0.0.spec
Unescape View File

@ -712,6 +712,8 @@ Requires: libcaldav
Requires: libcarddav Requires: libcarddav
Obsoletes: tdepim-tderesources-devel < %{version}-%{release} Obsoletes: tdepim-tderesources-devel < %{version}-%{release}
Obsoletes: trinity-tdepim-kresources-devel < %{version}-%{release}
Provides: trinity-tdepim-kresources-devel = %{version}-%{release}
%description tderesources-devel %description tderesources-devel
%{summary} %{summary}
@ -2210,6 +2212,11 @@ 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"
# Specific path for RHEL4
if [ -d "/usr/X11R6" ]; then
export RPM_OPT_FLAGS="${RPM_OPT_FLAGS} -I/usr/X11R6/include -L/usr/X11R6/%{_lib}"
fi
if ! rpm -E %%cmake|grep -q "cd build"; then if ! rpm -E %%cmake|grep -q "cd build"; then
%__mkdir_p build %__mkdir_p build
cd build cd build

Write Preview
Loading…
Cancel
Save