From 562049cd694f6dd0927b9880227fc4f6da008839 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Andriot?= Date: Wed, 5 Aug 2015 20:25:18 +0200 Subject: RPM Packaging: massive update --- .../applications/bibletime/bibletime-14.0.0.patch | 26 --- .../applications/bibletime/bibletime-14.0.0.spec | 2 - .../applications/bibletime/bibletime-14.0.1.spec | 185 --------------------- 3 files changed, 213 deletions(-) delete mode 100644 redhat/applications/bibletime/bibletime-14.0.0.patch delete mode 100644 redhat/applications/bibletime/bibletime-14.0.1.spec (limited to 'redhat/applications/bibletime') diff --git a/redhat/applications/bibletime/bibletime-14.0.0.patch b/redhat/applications/bibletime/bibletime-14.0.0.patch deleted file mode 100644 index eaae32d16..000000000 --- a/redhat/applications/bibletime/bibletime-14.0.0.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git a/bibletime/backend/cswordbackend.cpp b/bibletime/backend/cswordbackend.cpp -index 1c218b3..dda6275 100644 ---- a/bibletime/backend/cswordbackend.cpp -+++ b/bibletime/backend/cswordbackend.cpp -@@ -251,7 +251,7 @@ const bool CSwordBackend::shutdownModules() { - - /** Returns true if the given option is enabled. */ - const bool CSwordBackend::isOptionEnabled( const CSwordModuleInfo::FilterTypes type) { -- return (getGlobalOption( optionName(type).latin1() ) == "On"); -+ return (strcmp(getGlobalOption( optionName(type).latin1() ), "On") == 0); - } - - /** Sets the given options enabled or disabled depending on the second parameter. */ -diff --git a/bibletime/frontend/cdragdropmgr.cpp b/bibletime/frontend/cdragdropmgr.cpp -index 52d012f..4f8c4fe 100644 ---- a/bibletime/frontend/cdragdropmgr.cpp -+++ b/bibletime/frontend/cdragdropmgr.cpp -@@ -36,7 +36,7 @@ bool CDragDropMgr::BTDrag::canDecode( const TQMimeSource * mime ) { - }; - - bool CDragDropMgr::BTDrag::provides( const char* type ) const { -- return (type == "BibleTime/DND"); //return only true if the type is BibleTime/DND -+ return (strcmp(type, "BibleTime/DND") == 0); //return only true if the type is BibleTime/DND - }; - - const char* CDragDropMgr::BTDrag::format( int i ) const { diff --git a/redhat/applications/bibletime/bibletime-14.0.0.spec b/redhat/applications/bibletime/bibletime-14.0.0.spec index 27e75ffdd..d6d64f84e 100644 --- a/redhat/applications/bibletime/bibletime-14.0.0.spec +++ b/redhat/applications/bibletime/bibletime-14.0.0.spec @@ -55,7 +55,6 @@ Prefix: %{_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz -Patch0: %{tde_pkg}-%{tde_version}.patch BuildRequires: trinity-tdelibs-devel >= %{tde_version} BuildRequires: trinity-tdebase-devel >= %{tde_version} @@ -109,7 +108,6 @@ texts, write own notes, save, print etc.). %prep %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}} -%patch0 -p1 -b .rpmlint %__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" diff --git a/redhat/applications/bibletime/bibletime-14.0.1.spec b/redhat/applications/bibletime/bibletime-14.0.1.spec deleted file mode 100644 index b864094e4..000000000 --- a/redhat/applications/bibletime/bibletime-14.0.1.spec +++ /dev/null @@ -1,185 +0,0 @@ -# -# spec file for package bibletime (version R14) -# -# Copyright (c) 2014 Trinity Desktop Environment -# -# All modifications and additions to the file contributed by third parties -# remain the property of their copyright owners, unless otherwise agreed -# upon. The license for this file, and modifications and additions to the -# file, is the same license as for the pristine package itself (unless the -# license for the pristine package is not an Open Source License, in which -# case the license is the MIT License). An "Open Source License" is a -# license that conforms to the Open Source Definition (Version 1.9) -# published by the Open Source Initiative. -# -# Please submit bugfixes or comments via http://www.trinitydesktop.org/ -# - -# TDE variables -%define tde_epoch 2 -%if "%{?tde_version}" == "" -%define tde_version 14.0.1 -%endif -%define tde_pkg bibletime -%define tde_prefix /opt/trinity -%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/tde -%define tde_tdedocdir %{tde_docdir}/tde -%define tde_tdeincludedir %{tde_includedir}/tde -%define tde_tdelibdir %{tde_libdir}/trinity - - -Name: trinity-%{tde_pkg} -Epoch: %{tde_epoch} -Version: 1.6.6.0 -Release: %{?!preversion:1}%{?preversion:0_%{preversion}}%{?dist}%{?_variant} -Summary: A bible study tool for Trinity -Group: Applications/Utilities -URL: http://www.trinitydesktop.org/ - -%if 0%{?suse_version} -License: GPL-2.0+ -%else -License: GPLv2+ -%endif - -#Vendor: Trinity Desktop -#Packager: Francois Andriot - -Prefix: %{_prefix} -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Source0: %{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz - -BuildRequires: trinity-tdelibs-devel >= %{tde_version} -BuildRequires: trinity-tdebase-devel >= %{tde_version} - -BuildRequires: autoconf automake libtool m4 -BuildRequires: gcc-c++ -BuildRequires: pkgconfig -BuildRequires: libtool -BuildRequires: desktop-file-utils -BuildRequires: gettext - -# SUSE desktop files utility -%if 0%{?suse_version} -BuildRequires: update-desktop-files -%endif - -%if 0%{?opensuse_bs} && 0%{?suse_version} -# for xdg-menu script -BuildRequires: brp-check-trinity -%endif - -# BOOST support -BuildRequires: boost-devel - -# Requires: clucene -%if 0%{?fedora} || 0%{?suse_version} || 0%{?rhel} >= 6 -BuildRequires: clucene-core-devel -%endif -%if 0%{?mgaversion} || 0%{?mdkversion} -BuildRequires: %{_lib}clucene-devel -%endif - -# Requires: sword -BuildRequires: sword-devel -Requires: sword - -%description -BibleTime is a free and easy to use bible study tool for UNIX systems. -It requires a working TDE environment and the SWORD library. -BibleTime provides easy handling of digitized texts (Bibles, commentaries -and lexicons) and powerful features to work with these texts (search in -texts, write own notes, save, print etc.). - -########## - -%if 0%{?pclinuxos} || 0%{?suse_version} && 0%{?opensuse_bs} == 0 -%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}" -export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}" - -%configure \ - --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 \ - --enable-rpath \ - --disable-gcc-hidden-visibility - -# Not SMP safe ! -%__make -C bibletime/frontend - -# SMP safe ! -%__make %{?_smp_mflags} || %__make - - -%install -export PATH="%{tde_bindir}:${PATH}" -%__rm -rf %{buildroot} -%__make install DESTDIR=%{buildroot} - -%__chmod 644 %{buildroot}%{tde_datadir}/apps/bibletime/pics/* -%__chmod 644 %{buildroot}%{tde_datadir}/apps/bibletime/bibletimeui.rc -%__chmod 644 %{buildroot}%{tde_datadir}/apps/bibletime/tips - -echo "OnlyShowIn=TDE;" >>"%{?buildroot}%{tde_datadir}/applications/bibletime.desktop" - - -%clean -%__rm -rf %{buildroot} - - -%post -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : -update-desktop-database %{tde_datadir}/applications -q &> /dev/null - - -%postun -touch --no-create %{tde_datadir}/icons/hicolor || : -gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || : -update-desktop-database %{tde_datadir}/applications -q &> /dev/null - - -%files -%defattr(-,root,root,-) -%{tde_bindir}/bibletime -%{tde_tdeincludedir}/bibletimeinterface.h -%{tde_datadir}/applications/bibletime.desktop -%{tde_datadir}/apps/bibletime/ -%{tde_datadir}/icons/hicolor/*/*/*.png -%{tde_tdedocdir}/HTML/en/bibletime/ - - -%changelog -* Fri Jul 05 2013 Francois Andriot - 2:1.6.6.0-1 -- Initial release for TDE 14.0.0 -- cgit v1.2.1