Browse Source

RPM Packaging: cleanup bibletime

François Andriot 4 years ago
parent
commit
0d23af4ec6

+ 8
- 11
redhat/Makefile.r14 View File

@@ -238,12 +238,6 @@ ifneq ($(wildcard /boot/vmlinuz*.el5*),)
238 238
 	$(call buildpkg,3rdparty/sip)
239 239
 endif
240 240
 
241
-sword:
242
-# Build on Fedora >= 20, PCLinuxOS, CentOS >= 7
243
-ifneq ($(wildcard /boot/vmlinuz*.fc20* /etc/pclinuxos-release /boot/vmlinuz*.el7*),)
244
-	$(call buildpkg,3rdparty/sword)
245
-endif
246
-
247 241
 torsocks:
248 242
 	$(call buildpkg,3rdparty/torsocks)
249 243
 
@@ -306,7 +300,7 @@ amarok:	tdebase cmake
306 300
 basket:	tdebase
307 301
 	$(call buildpkg,applications/basket)
308 302
 
309
-bibletime:	tdebase sword
303
+bibletime:	tdebase
310 304
 	$(call buildpkg,applications/bibletime)
311 305
 
312 306
 compizconfig-backend-kconfig:	tdebase
@@ -594,7 +588,7 @@ tdeio-ftps:	tdebase
594 588
 tdeio-locate:	tdebase
595 589
 	$(call buildpkg,applications/tdeio-locate)
596 590
 
597
-tdeio-sword:	tdebase sword
591
+tdeio-sword:	tdebase
598 592
 	$(call buildpkg,applications/tdeio-sword)
599 593
 
600 594
 tdeio-umountwrapper:	tdebase
@@ -666,12 +660,12 @@ meta:
666 660
 	$(call buildpkg,extras/trinity-desktop)
667 661
 
668 662
 ### Extra packages
663
+celestia:
664
+	$(call buildpkg,extras/celestia)
665
+
669 666
 fileshareset:
670 667
 	$(call buildpkg,extras/fileshareset)
671 668
 
672
-trinity-filesystem:
673
-	$(call buildpkg,extras/trinity-filesystem)
674
-
675 669
 hk_classes:
676 670
 	$(call buildpkg,extras/hk_classes)
677 671
 
@@ -710,3 +704,6 @@ scribus:
710 704
 
711 705
 style-ia-ora:
712 706
 	$(call buildpkg,extras/style-ia-ora)
707
+
708
+trinity-filesystem:
709
+	$(call buildpkg,extras/trinity-filesystem)

+ 4
- 4
redhat/applications/amarok/amarok-14.0.0.spec View File

@@ -167,8 +167,8 @@ BuildRequires: libxine-devel
167 167
 %endif
168 168
 
169 169
 # AKODE support
170
-%if 0
171
-%define with_akode 1
170
+%define with_akode 0
171
+%if 0 && 0%{?with_akode}
172 172
 BuildRequires:	trinity-akode-devel
173 173
 %endif
174 174
 
@@ -289,7 +289,7 @@ Amarok is a multimedia player with:
289 289
 %{tde_tdelibdir}/libamarok_yauap-engine_plugin.*
290 290
 %endif
291 291
 # AKODE
292
-%if 0%{?with_akode}
292
+%if 0 && 0%{?with_akode}
293 293
 %{tde_datadir}/services/amarok_aKode-engine.desktop
294 294
 %{tde_tdelibdir}/libamarok_aKode-engine.*
295 295
 %endif
@@ -410,7 +410,7 @@ fi
410 410
   -DWITH_KONQSIDEBAR=ON \
411 411
   %{?with_xine:-DWITH_XINE=ON} \
412 412
   %{?with_yauap:-DWITH_YAUAP=ON} \
413
-  %{?with_akode:-DWITH_AKODE=ON} \
413
+  -DWITH_AKODE=OFF \
414 414
   %{?with_gpod:-DWITH_IPOD=ON} \
415 415
   %{?with_ifp:-DWITH_IFP=ON} \
416 416
   %{?with_njb:-DWITH_NJB=ON} \

+ 1
- 5
redhat/applications/bibletime/bibletime-14.0.0.spec View File

@@ -100,11 +100,7 @@ export PKG_CONFIG_PATH="%{tde_libdir}/pkgconfig:${PKG_CONFIG_PATH}"
100 100
   --enable-final \
101 101
   --enable-closure \
102 102
   --enable-rpath \
103
-  --disable-gcc-hidden-visibility \
104
-  \
105
-%if 0%{?pclinuxos} || 0%{?rhel} >= 7
106
-  --with-sword-dir=%{tde_prefix}
107
-%endif
103
+  --disable-gcc-hidden-visibility
108 104
 
109 105
 # Not SMP safe !
110 106
 %__make -C bibletime/frontend

+ 0
- 20
redhat/applications/bibletime/bibletime-3.5.13-clucene_detection.patch View File

@@ -1,20 +0,0 @@
1
---- clucene.m4.ORI	2011-11-30 19:22:02.284530031 +0100
2
-+++ clucene.m4	2011-11-30 20:03:45.704532045 +0100
3
-@@ -28,7 +28,7 @@
4
- 
5
- dnl try to find CLucene library files
6
- AC_MSG_CHECKING([for CLucene library files])
7
--ac_clucene_library_dirs="$ac_clucene_dir/lib $exec_prefix/lib $prefix/lib /usr/lib /usr/lib64 /usr/local/lib"
8
-+ac_clucene_library_dirs="/usr/lib/clucene09 /usr/lib64/clucene09 $ac_clucene_dir/lib $exec_prefix/lib $prefix/lib /usr/lib /usr/lib64 /usr/local/lib"
9
- 
10
- if test "x$ac_static_clucene" = "xYES"; then
11
- 	SEARCH_LIBS="libclucene.a";
12
-@@ -62,7 +62,7 @@
13
- 
14
- dnl -- try to find CLucene include files --
15
- AC_MSG_CHECKING([for Clucene include files])
16
--ac_clucene_include_dirs="$ac_clucene_dir/include $exec_prefix/include $prefix/include /usr/include /usr/local/include"
17
-+ac_clucene_include_dirs=" /usr/include/clucene09 $ac_clucene_dir/include $exec_prefix/include $prefix/include /usr/include /usr/local/include"
18
- 
19
- AC_CACHE_VAL(ac_cv_clucene_incdir, AC_FIND_FILE(CLucene.h, $ac_clucene_include_dirs, ac_cv_clucene_incdir))
20
- 

+ 0
- 13
redhat/applications/bibletime/bibletime-3.5.13-fix_gcc47_compilation.patch View File

@@ -1,13 +0,0 @@
1
---- bibletime/bibletime/frontend/cinfodisplay.cpp.ORI	2012-05-01 14:13:38.750903801 +0200
2
-+++ bibletime/bibletime/frontend/cinfodisplay.cpp	2012-05-01 14:14:59.998011927 +0200
3
-@@ -229,8 +229,8 @@
4
- 			VerseKey vk;
5
- 			sword::ListKey refs = vk.ParseVerseList((const char*)data.mid((pos == -1) ? 0 : pos+1).utf8(), "Gen 1:1", true);
6
- 
7
--			for (int i = 0; i < refs.Count(); ++i) {
8
--				SWKey* key = refs.getElement(i);
9
-+			for (int j = 0; j < refs.Count(); ++j) {
10
-+				SWKey* key = refs.getElement(j);
11
- 				Q_ASSERT(key);
12
- 				VerseKey* vk = dynamic_cast<VerseKey*>(key);
13
- 

+ 0
- 31
redhat/applications/bibletime/bibletime-3.5.13-fix_sword_linking.patch View File

@@ -1,31 +0,0 @@
1
---- bibletime/sword.m4.ftbfs	2011-05-17 20:42:02.000000000 +0200
2
-+++ bibletime/sword.m4	2012-08-03 17:40:00.461746639 +0200
3
-@@ -119,7 +119,7 @@
4
- EOF
5
- 
6
- 
7
--ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
8
-+ac_link='$LIBTOOL_SHELL --silent --mode=link --tag=LD ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
9
- if AC_TRY_EVAL(ac_link) && test -s conftest; then
10
- 	if test -x conftest; then
11
- 		eval ac_cv_installed_sword_version=`./conftest 2>&5`
12
-@@ -192,7 +192,7 @@
13
- }
14
- EOF
15
- 
16
--ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
17
-+ac_link='$LIBTOOL_SHELL --silent --mode=link --tag=LD ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
18
- if AC_TRY_EVAL(ac_link) && test -s conftest; then
19
- 	if test -x conftest; then
20
- 		eval ac_cv_sword_recent_version=`./conftest $1 2>&5`
21
---- bibletime/clucene.m4.ORI	2012-08-03 17:41:19.989067063 +0200
22
-+++ bibletime/clucene.m4	2012-08-03 17:41:35.675734952 +0200
23
-@@ -119,7 +119,7 @@
24
- EOF
25
- 
26
- 
27
--ac_link='$LIBTOOL_SHELL --silent --mode=link ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
28
-+ac_link='$LIBTOOL_SHELL --silent --mode=link --tag=LD ${CXX-g++} -o conftest $CXXFLAGS $all_includes $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
29
- if AC_TRY_EVAL(ac_link) && test -s conftest; then
30
- 	if test -x conftest; then
31
- 		eval ac_cv_installed_clucene_version=`./conftest 2>&5`

+ 0
- 164
redhat/applications/bibletime/bibletime-3.5.13.1.spec View File

@@ -1,164 +0,0 @@
1
-# Default version for this component
2
-%define kdecomp bibletime
3
-
4
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
5
-%if "%{?tde_prefix}" != "/usr"
6
-%define _variant .opt
7
-%endif
8
-
9
-# TDE 3.5.13 specific building variables
10
-%define tde_bindir %{tde_prefix}/bin
11
-%define tde_datadir %{tde_prefix}/share
12
-%define tde_docdir %{tde_datadir}/doc
13
-%define tde_includedir %{tde_prefix}/include
14
-%define tde_libdir %{tde_prefix}/%{_lib}
15
-%define tde_mandir %{tde_datadir}/man
16
-
17
-%define tde_tdeappdir %{tde_datadir}/applications/kde
18
-%define tde_tdedocdir %{tde_docdir}/tde
19
-%define tde_tdeincludedir %{tde_includedir}/tde
20
-%define tde_tdelibdir %{tde_libdir}/trinity
21
-
22
-%define _docdir %{tde_docdir}
23
-
24
-
25
-Name:		trinity-%{kdecomp}
26
-Summary:	A bible study tool for Trinity
27
-Version:	1.6.6.0
28
-Release:	3%{?dist}%{?_variant}
29
-
30
-License:	GPLv2+
31
-Group:		Applications/Utilities
32
-
33
-Vendor:		Trinity Project
34
-Packager:	Francois Andriot <francois.andriot@free.fr>
35
-URL:		http://www.trinitydesktop.org
36
-
37
-Prefix:    %{_prefix}
38
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
39
-
40
-Source0:	%{kdecomp}-3.5.13.1.tar.gz
41
-
42
-# Fix detection of older versions of clucene in Fedora >= 16
43
-Patch0:		bibletime-3.5.13-clucene_detection.patch
44
-# [bibletime] Fix FTBFS on Mageia 2, error at linking with 'sword'
45
-Patch2:		bibletime-3.5.13-fix_sword_linking.patch
46
-
47
-BuildRequires:	trinity-tqtinterface-devel >= 3.5.13.1
48
-BuildRequires:	trinity-tdelibs-devel >= 3.5.13.1
49
-BuildRequires:	trinity-tdebase-devel >= 3.5.13.1
50
-BuildRequires:	desktop-file-utils
51
-BuildRequires:	gettext
52
-
53
-# Bibletime only works with clucene 0.9 ! Mageia 2 does not ship with that old version !
54
-%if 0%{?fedora} >= 16 || 0%{?suse_version}
55
-BuildRequires:	clucene09-core-devel
56
-%else
57
-%if 0%{?mgaversion} || 0%{?mdkversion}
58
-BuildRequires:	clucene-devel < 1.0
59
-%else
60
-BuildRequires:	clucene-core-devel
61
-%endif
62
-%endif
63
-
64
-BuildRequires:	sword-devel
65
-Requires:		sword
66
-
67
-%description
68
-BibleTime is a free and easy to use bible study tool for UNIX systems.
69
-It requires a working KDE environment and the SWORD library.
70
-BibleTime provides easy handling of digitized texts (Bibles, commentaries
71
-and lexicons) and powerful features to work with these texts (search in
72
-texts, write own notes, save, print etc.).
73
- 
74
-
75
-%if 0%{?suse_version} || 0%{?pclinuxos}
76
-%debug_package
77
-%endif
78
-
79
-
80
-%prep
81
-%setup -q -n %{kdecomp}-3.5.13.1
82
-%patch0 -p0 -b .clucene
83
-%patch2 -p1 -b .ftbfs
84
-
85
-# Ugly hack to modify TQT include directory inside autoconf files.
86
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
87
-%__sed -i admin/acinclude.m4.in \
88
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
89
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
90
-
91
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
92
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
93
-%__make -f "admin/Makefile.common"
94
-
95
-
96
-%build
97
-unset QTDIR; . /etc/profile.d/qt3.sh
98
-export PATH="%{tde_bindir}:${PATH}"
99
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
100
-
101
-%configure \
102
-	--prefix=%{tde_prefix} \
103
-	--exec-prefix=%{tde_prefix} \
104
-	--bindir=%{tde_bindir} \
105
-	--libdir=%{tde_libdir} \
106
-	--datadir=%{tde_datadir} \
107
-	--includedir=%{tde_tdeincludedir} \
108
-	--disable-rpath \
109
-	--with-extra-includes=%{tde_includedir}/tqt
110
-
111
-# Not SMP safe !
112
-%__make -C bibletime/frontend
113
-
114
-# SMP safe !
115
-%__make %{?_smp_mflags}
116
-
117
-
118
-%install
119
-export PATH="%{tde_bindir}:${PATH}"
120
-%__rm -rf %{buildroot}
121
-%__make install DESTDIR=%{buildroot}
122
-
123
-%__chmod 644 %{buildroot}%{tde_datadir}/apps/bibletime/pics/*
124
-%__chmod 644 %{buildroot}%{tde_datadir}/apps/bibletime/bibletimeui.rc
125
-%__chmod 644 %{buildroot}%{tde_datadir}/apps/bibletime/tips
126
-
127
-
128
-
129
-
130
-%clean
131
-%__rm -rf %{buildroot}
132
-
133
-
134
-%post
135
-touch --no-create %{tde_datadir}/icons/hicolor || :
136
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
137
-/sbin/ldconfig || :
138
-
139
-%postun
140
-touch --no-create %{tde_datadir}/icons/hicolor || :
141
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
142
-/sbin/ldconfig || :
143
-
144
-
145
-%files
146
-%defattr(-,root,root,-)
147
-%{tde_bindir}/bibletime
148
-%{tde_tdeincludedir}/bibletimeinterface.h
149
-%{tde_datadir}/applications/bibletime.desktop
150
-%{tde_datadir}/apps/bibletime/
151
-%{tde_datadir}/icons/hicolor/*/*/*.png
152
-%{tde_tdedocdir}/HTML/en/bibletime/
153
-
154
-
155
-%changelog
156
-* Wed Oct 03 2012 Francois Andriot <francois.andriot@free.fr> - 1.6.6.0-3
157
-- Initial release for TDE 3.5.13.1
158
-
159
-* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 1.6.6.0-2
160
-- Fix compilation on RHEL 5
161
-- Fix compilation with GCC 4.7
162
-
163
-* Tue Nov 29 2011 Francois Andriot <francois.andriot@free.fr> - 1.6.6.0-1
164
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16

+ 0
- 38
redhat/applications/bibletime/bibletime-3.5.13.2-fix_sword_detection.patch View File

@@ -1,38 +0,0 @@
1
-commit 298da70ab4f6da3780c617a85957a80f2e7ae71b
2
-Author: Francois Andriot <francois.andriot@free.fr>
3
-Date:   1398949579 +0200
4
-
5
-    Fix FTBFS on Fedora 20
6
-    Fix custom-installed Sword detection
7
-
8
-diff --git a/bibletime/backend/clanguagemgr.cpp b/bibletime/backend/clanguagemgr.cpp
9
-index 8f73ec3..ac94790 100644
10
---- a/bibletime/backend/clanguagemgr.cpp
11
-+++ b/bibletime/backend/clanguagemgr.cpp
12
-@@ -95,10 +95,10 @@ const CLanguageMgr::LangMap& CLanguageMgr::availableLanguages() {
13
- 
14
- 		for (ListCSwordModuleInfo::iterator it(mods.begin()); it != end_it; ++it) {
15
- 			//   for (CSwordModuleInfo* m = mods.first(); m; m = mods.next()) {
16
--			abbrev = (*it)->module()->Lang();
17
-+			const char* mod = (*it)->module()->Lang();
18
- 
19
--			if (abbrev && !abbrevs.contains(abbrev)) {
20
--				abbrevs.append( abbrev );
21
-+			if (mod && !abbrevs.contains(mod)) {
22
-+				abbrevs.append( mod );
23
- 			}
24
- 		};
25
- 
26
-diff --git a/sword.m4 b/sword.m4
27
-index 2f19b3f..8326ba3 100644
28
---- a/sword.m4
29
-+++ b/sword.m4
30
-@@ -28,7 +28,7 @@ AC_ARG_ENABLE(static-sword,
31
- dnl try to find Sword library files
32
- AC_MSG_CHECKING([for Sword library files])
33
- AC_REQUIRE([AC_FIND_ZLIB])
34
--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"
35
-+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"
36
- 
37
- if test "x$ac_static_sword" = "xYES"; then
38
- 	SEARCH_LIBS="libsword.a";

+ 4
- 4
redhat/applications/bibletime/bibletime-3.5.13.2.spec View File

@@ -26,7 +26,7 @@
26 26
 Name:			trinity-%{tde_pkg}
27 27
 Summary:		A bible study tool for Trinity
28 28
 Version:		1.6.6.0
29
-Release:		%{?!preversion:6}%{?preversion:5_%{preversion}}%{?dist}%{?_variant}
29
+Release:		%{?!preversion:7}%{?preversion:6_%{preversion}}%{?dist}%{?_variant}
30 30
 
31 31
 License:		GPLv2+
32 32
 Group:			Applications/Utilities
@@ -40,8 +40,6 @@ BuildRoot:		%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
40 40
 
41 41
 Source0:		%{name}-%{tde_version}%{?preversion:~%{preversion}}.tar.gz
42 42
 
43
-Patch0:			bibletime-3.5.13.2-fix_sword_detection.patch
44
-
45 43
 BuildRequires:	trinity-tqtinterface-devel >= %{tde_version}
46 44
 BuildRequires:	trinity-arts-devel >= 1:1.5.10
47 45
 BuildRequires:	trinity-tdelibs-devel >= %{tde_version}
@@ -77,7 +75,6 @@ texts, write own notes, save, print etc.).
77 75
 
78 76
 %prep
79 77
 %setup -q -n %{name}-%{tde_version}%{?preversion:~%{preversion}}
80
-%patch0 -p1 -b .ftbfs
81 78
 
82 79
 %__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
83 80
 %__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
@@ -152,6 +149,9 @@ update-desktop-database %{tde_datadir}/applications -q &> /dev/null
152 149
 
153 150
 
154 151
 %changelog
152
+* Sun Sep 21 2014 Francois Andriot <francois.andriot@free.fr> - 1.6.6.0-7
153
+- Fix build with Sword 1.7
154
+
155 155
 * Fri Aug 16 2013 Francois Andriot <francois.andriot@free.fr> - 1.6.6.0-5
156 156
 - Build for Fedora 19
157 157
 

+ 0
- 159
redhat/applications/bibletime/bibletime-3.5.13.spec View File

@@ -1,159 +0,0 @@
1
-# Default version for this component
2
-%define kdecomp bibletime
3
-
4
-# If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt".
5
-%if "%{?tde_prefix}" != "/usr"
6
-%define _variant .opt
7
-%endif
8
-
9
-# TDE 3.5.13 specific building variables
10
-%define tde_bindir %{tde_prefix}/bin
11
-%define tde_datadir %{tde_prefix}/share
12
-%define tde_docdir %{tde_datadir}/doc
13
-%define tde_includedir %{tde_prefix}/include
14
-%define tde_libdir %{tde_prefix}/%{_lib}
15
-%define tde_mandir %{tde_datadir}/man
16
-
17
-%define tde_tdeappdir %{tde_datadir}/applications/kde
18
-%define tde_tdedocdir %{tde_docdir}/kde
19
-%define tde_tdeincludedir %{tde_includedir}/kde
20
-%define tde_tdelibdir %{tde_libdir}/trinity
21
-
22
-%define _docdir %{tde_docdir}
23
-
24
-
25
-Name:		trinity-%{kdecomp}
26
-Summary:	A bible study tool for Trinity
27
-Version:	1.6.6.0
28
-Release:	2%{?dist}%{?_variant}
29
-
30
-License:	GPLv2+
31
-Group:		Applications/Utilities
32
-
33
-Vendor:		Trinity Project
34
-Packager:	Francois Andriot <francois.andriot@free.fr>
35
-URL:		http://www.trinitydesktop.org
36
-
37
-Prefix:    %{_prefix}
38
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
39
-
40
-Source0:	%{kdecomp}-3.5.13.tar.gz
41
-
42
-# Fix detection of older versions of clucene in Fedora >= 16
43
-Patch0:		bibletime-3.5.13-clucene_detection.patch
44
-# [bibletime] Fix compilation with GCC 4.7
45
-Patch1:		bibletime-3.5.13-fix_gcc47_compilation.patch
46
-# [bibletime] Fix FTBFS on Mageia 2, error at linking with 'sword'
47
-Patch2:		bibletime-3.5.13-fix_sword_linking.patch
48
-
49
-BuildRequires:	tqtinterface-devel
50
-BuildRequires:	trinity-kdelibs-devel
51
-BuildRequires:	trinity-kdebase-devel
52
-BuildRequires:	desktop-file-utils
53
-BuildRequires:	gettext
54
-
55
-# Bibletime only works with clucene 0.9 ! Mageia 2 does not ship with that old version !
56
-%if 0%{?fedora} >= 16
57
-BuildRequires:	clucene09-core-devel
58
-%else
59
-%if 0%{?mgaversion} || 0%{?mdkversion}
60
-BuildRequires:	clucene-devel
61
-%else
62
-BuildRequires:	clucene-core-devel
63
-%endif
64
-%endif
65
-
66
-BuildRequires:	sword-devel
67
-Requires:		sword
68
-
69
-%description
70
-BibleTime is a free and easy to use bible study tool for UNIX systems.
71
-It requires a working KDE environment and the SWORD library.
72
-BibleTime provides easy handling of digitized texts (Bibles, commentaries
73
-and lexicons) and powerful features to work with these texts (search in
74
-texts, write own notes, save, print etc.).
75
- 
76
-
77
-%prep
78
-%setup -q -n applications/%{kdecomp}
79
-%patch0 -p0
80
-%patch1 -p1 -b .gcc47
81
-%patch2 -p1 -b .ftbfs
82
-
83
-# Ugly hack to modify TQT include directory inside autoconf files.
84
-# If TQT detection fails, it fallbacks to TQT4 instead of TQT3 !
85
-%__sed -i admin/acinclude.m4.in \
86
-  -e "s|/usr/include/tqt|%{tde_includedir}/tqt|g" \
87
-  -e "s|kde_htmldir='.*'|kde_htmldir='%{tde_tdedocdir}/HTML'|g"
88
-
89
-%__cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
90
-%__cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh" || %__cp -f "/usr/share/libtool/ltmain.sh" "admin/ltmain.sh"
91
-%__make -f "admin/Makefile.common"
92
-
93
-
94
-%build
95
-unset QTDIR; . /etc/profile.d/qt.sh
96
-export PATH="%{tde_bindir}:${PATH}"
97
-export LDFLAGS="-L%{tde_libdir} -I%{tde_includedir}"
98
-
99
-%configure \
100
-	--prefix=%{tde_prefix} \
101
-	--exec-prefix=%{tde_prefix} \
102
-	--bindir=%{tde_bindir} \
103
-	--libdir=%{tde_libdir} \
104
-	--datadir=%{tde_datadir} \
105
-	--includedir=%{tde_tdeincludedir} \
106
-	--disable-rpath \
107
-    --with-extra-includes=%{tde_includedir}/tqt
108
-
109
-# Not SMP safe !
110
-%__make -C bibletime/frontend
111
-
112
-# SMP safe !
113
-%__make %{?_smp_mflags}
114
-
115
-
116
-%install
117
-export PATH="%{tde_bindir}:${PATH}"
118
-%__rm -rf %{buildroot}
119
-%__make install DESTDIR=%{buildroot}
120
-
121
-%__chmod 644 %{buildroot}%{tde_datadir}/apps/bibletime/pics/*
122
-%__chmod 644 %{buildroot}%{tde_datadir}/apps/bibletime/bibletimeui.rc
123
-%__chmod 644 %{buildroot}%{tde_datadir}/apps/bibletime/tips
124
-
125
-
126
-
127
-
128
-%clean
129
-%__rm -rf %{buildroot}
130
-
131
-
132
-%post
133
-touch --no-create %{tde_datadir}/icons/hicolor || :
134
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
135
-/sbin/ldconfig || :
136
-
137
-%postun
138
-touch --no-create %{tde_datadir}/icons/hicolor || :
139
-gtk-update-icon-cache --quiet %{tde_datadir}/icons/hicolor || :
140
-/sbin/ldconfig || :
141
-
142
-
143
-%files
144
-%defattr(-,root,root,-)
145
-%{tde_bindir}/bibletime
146
-%{tde_tdeincludedir}/bibletimeinterface.h
147
-%{tde_datadir}/applications/bibletime.desktop
148
-%{tde_datadir}/apps/bibletime/
149
-%{tde_datadir}/icons/hicolor/*/*/*.png
150
-%{tde_tdedocdir}/HTML/en/bibletime/
151
-
152
-
153
-%Changelog
154
-* Tue May 01 2012 Francois Andriot <francois.andriot@free.fr> - 1.6.6.0-2
155
-- Fix compilation on RHEL 5
156
-- Fix compilation with GCC 4.7
157
-
158
-* Tue Nov 29 2011 Francois Andriot <francois.andriot@free.fr> - 1.6.6.0-1
159
-- Initial release for RHEL 5, RHEL 6, Fedora 15, Fedora 16

+ 1
- 1
redhat/build/build_rpm_package.sh View File

@@ -29,7 +29,7 @@ if [ -r "${PATCHLIST}" ]; then
29 29
     APPLY=""
30 30
     case "${l}" in
31 31
       ""|"#"*);;
32
-     "*opensuse*") [ -r /etc/SuSE-release ] && APPLY=1;;
32
+     *"opensuse"*) [ -r /etc/SuSE-release ] && APPLY=1;;
33 33
      *) APPLY=1;;
34 34
     esac
35 35
     

+ 1
- 0
redhat/packages.fedora View File

@@ -29,6 +29,7 @@ doxygen
29 29
 dssi-devel
30 30
 esound-devel
31 31
 exiv2-devel
32
+fdupes
32 33
 ffmpeg-devel
33 34
 fftw-devel
34 35
 file-devel

+ 1
- 0
redhat/tdeartwork/tdeartwork-14.0.0.spec View File

@@ -667,6 +667,7 @@ This package is part of Trinity, and a component of the TDE artwork module.
667 667
 %if 0%{?fedora} >= 20
668 668
 %{tde_datadir}/applnk/System/ScreenSavers/projectiveplane.desktop
669 669
 %{tde_datadir}/applnk/System/ScreenSavers/tessellimage.desktop
670
+%{tde_datadir}/applnk/System/ScreenSavers/winduprobot.desktop
670 671
 %endif
671 672
 
672 673
 %endif

+ 2
- 2
redhat/tdelibs/tdelibs-14.0.0.spec View File

@@ -253,12 +253,12 @@ BuildRequires:	xz-devel
253 253
 %endif
254 254
 
255 255
 # Certificates support
256
-%if 0%{?rhel} == 6 || 0%{?fedora}
256
+%if 0%{?rhel} == 6 || 0%{?fedora} == 18 || 0%{?fedora} == 19
257 257
 %define	cacert	%{_sysconfdir}/ssl/certs/ca-certificates.crt
258 258
 BuildRequires:	ca-certificates
259 259
 Requires:		ca-certificates
260 260
 %endif
261
-%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 7
261
+%if 0%{?mgaversion} || 0%{?mdkversion} || 0%{?rhel} >= 7 || 0%{?fedora} >= 20
262 262
 %define	cacert	%{_sysconfdir}/ssl/certs/ca-bundle.crt
263 263
 Requires:		openssl
264 264
 %endif

Loading…
Cancel
Save