From 6e364689d85a063c565039b519091a608e71c659 Mon Sep 17 00:00:00 2001 From: albator Date: Sat, 29 Oct 2011 13:20:44 +0200 Subject: kdeartwork, kdebase, kdebindings, kdeedu, kdegames, kdegraphics 3.5.13 RPM --- redhat/kdebindings/trinity-kdebindings-3.5.13.spec | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'redhat/kdebindings/trinity-kdebindings-3.5.13.spec') diff --git a/redhat/kdebindings/trinity-kdebindings-3.5.13.spec b/redhat/kdebindings/trinity-kdebindings-3.5.13.spec index f4ea50005..f0b76045b 100644 --- a/redhat/kdebindings/trinity-kdebindings-3.5.13.spec +++ b/redhat/kdebindings/trinity-kdebindings-3.5.13.spec @@ -13,6 +13,7 @@ # TDE 3.5.13 specific building variables BuildRequires: autoconf automake libtool m4 %define tde_docdir %{_docdir}/kde +%define tde_includedir %{_includedir}/kde %define tde_libdir %{_libdir}/trinity @@ -26,7 +27,7 @@ Group: User Interface/Desktops Vendor: Trinity Project Packager: Francois Andriot -URL: http://developer.kde.org/language-bindings/ +URL: http://www.trinitydesktop.org/ Source0: kdebindings-%{version}.tar.gz @@ -114,7 +115,7 @@ unset JAVA_HOME ||: export DO_NOT_COMPILE="$DO_NOT_COMPILE python" %configure \ - --includedir=%{_includedir}/kde \ + --includedir=%{tde_includedir} \ --disable-rpath \ --enable-new-ldflags \ --disable-debug --disable-warnings \ @@ -145,8 +146,8 @@ popd %install -%__rm -rf $RPM_BUILD_ROOT export PATH="%{_bindir}:${PATH}" +%__rm -rf $RPM_BUILD_ROOT %make_install \ PYTHON=%{__python} @@ -206,7 +207,8 @@ for dir in dcopperl dcoppython kalyptus %{?_with_java:kdejava qtjava} kjsembed k done %clean -rm -rf $RPM_BUILD_ROOT +%__rm -rf $RPM_BUILD_ROOT + %post /sbin/ldconfig ||: @@ -255,8 +257,8 @@ update-desktop-database >& /dev/null ||: # Excludes 'kjscmd' (conflicts with 'kdelibs' from RHEL6) %if "%{?_prefix}" == "/usr" %exclude %{_bindir}/kjscmd -%exclude %{_mandir}/man1/kjscmd* %endif +%exclude %{_mandir}/man1/kjscmd* %files dcopperl -f %{name}-dcopperl.list @@ -266,7 +268,7 @@ update-desktop-database >& /dev/null ||: %files devel %defattr(-,root,root,-) -%{_includedir}/kde/* +%{tde_includedir}/* %{_libdir}/lib*.so %if "%{?_with_java:1}" == "1" %{_libdir}/jni/*.so -- cgit v1.2.1 From 703986bfe4270bb901f594b92eebb265d04ad8f5 Mon Sep 17 00:00:00 2001 From: albator Date: Sat, 29 Oct 2011 23:32:41 +0200 Subject: Lot of updates for TDE 3.5.13 (RHEL 5, RHEL 6, Fedora 15) --- redhat/kdebindings/trinity-kdebindings-3.5.13.spec | 43 ++++++++++------------ 1 file changed, 19 insertions(+), 24 deletions(-) (limited to 'redhat/kdebindings/trinity-kdebindings-3.5.13.spec') diff --git a/redhat/kdebindings/trinity-kdebindings-3.5.13.spec b/redhat/kdebindings/trinity-kdebindings-3.5.13.spec index f0b76045b..d395d44fb 100644 --- a/redhat/kdebindings/trinity-kdebindings-3.5.13.spec +++ b/redhat/kdebindings/trinity-kdebindings-3.5.13.spec @@ -13,8 +13,8 @@ # TDE 3.5.13 specific building variables BuildRequires: autoconf automake libtool m4 %define tde_docdir %{_docdir}/kde -%define tde_includedir %{_includedir}/kde %define tde_libdir %{_libdir}/trinity +%define tde_includedir %{_includedir}/kde Name: trinity-kdebindings @@ -31,6 +31,10 @@ URL: http://www.trinitydesktop.org/ Source0: kdebindings-%{version}.tar.gz +Prefix: %{_prefix} +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + + # RedHat Legacy patches (from Fedora) Patch1: kdebindings-3.5.6-libgcj.patch @@ -40,6 +44,8 @@ BuildRequires: trinity-kdelibs-devel BuildRequires: zlib-devel BuildRequires: perl(ExtUtils::MakeMaker) BuildRequires: trinity-arts-devel +BuildRequires: glib-devel gtk+-devel +BuildRequires: gtk2-devel %define perl_ver %{expand:%%(eval `perl -V:version`; echo $version)} %define perl_vendorarch %{expand:%%(eval `perl -V:installvendorarch`; echo $installvendorarch)} %define perl_vendorlib %{expand:%%(eval `perl -V:installvendorlib`; echo $installvendorlib)} @@ -60,12 +66,16 @@ Provides: %{name}-dcoppython = %{version}-%{release} ## ruby BuildRequires: ruby-devel >= 1.8, ruby Provides: %{name}-ruby = %{version}-%{release} +%{!?ruby_arch: %define ruby_arch %(ruby -rrbconfig -e 'puts Config::CONFIG["archdir"]')} %{!?ruby_sitelib: %define ruby_sitelib %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"]')} %{!?ruby_sitearch: %define ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"]')} ## java -#BuildRequires: java-1.4.2-gcj-compat-devel libgcj-devel gcc-java +%if 0%{?rhel} && 0%{?rhel} < 6 +BuildRequires: java-1.4.2-gcj-compat-devel libgcj-devel gcc-java +%else BuildRequires: java-devel >= 1.4.2 +%endif %define java_home %{_usr}/lib/jvm/java %define _with_java --with-java=%{java_home} Provides: %{name}-java = %{version}-%{release} @@ -122,6 +132,7 @@ export DO_NOT_COMPILE="$DO_NOT_COMPILE python" --disable-dependency-tracking \ --with-extra-libs=%{_libdir} \ --with-pythondir=%{_usr} \ + --enable-closure \ --disable-final \ %{?_with_java} %{!?_with_java:--without-java} \ %{?_enable_qscintilla} %{!?_enable_qscintilla:--disable-qscintilla} \ @@ -149,7 +160,7 @@ popd export PATH="%{_bindir}:${PATH}" %__rm -rf $RPM_BUILD_ROOT -%make_install \ +%__make install DESTDIR=%{?buildroot} \ PYTHON=%{__python} desktop-file-install \ @@ -176,14 +187,6 @@ fi # locale's %find_lang %{name} || touch %{name}.lang HTML_DIR=$(kde-config --expandvars --install html) - -# Fix HTML doc location in TDE 3.5.13 -# (from 'share/doc/HTML' to 'share/doc/kde/HTML') -if [ ! -d $RPM_BUILD_ROOT$HTML_DIR ] && [ -d $RPM_BUILD_ROOT%{_docdir}/HTML ]; then - mkdir -p $RPM_BUILD_ROOT${HTML_DIR%/*} - mv -f $RPM_BUILD_ROOT%{_docdir}/HTML $RPM_BUILD_ROOT${HTML_DIR%/*} -fi - if [ -d $RPM_BUILD_ROOT$HTML_DIR ]; then for lang_dir in $RPM_BUILD_ROOT$HTML_DIR/* ; do if [ -d $lang_dir ]; then @@ -248,17 +251,14 @@ update-desktop-database >& /dev/null ||: #%{ruby_sitelib}/K* #%{ruby_sitelib}/Qt* %{_usr}/lib/ruby/*/* -%if 0%{?fedora} >= 15 -%{_usr}/lib64/ruby/*/*/*.so.* -%else -%{_usr}/lib64/ruby/*/*.so.* -%endif +%{ruby_arch}/*.so.* +%doc %lang(en) %{_docdir}/HTML/en/javalib/* # Excludes 'kjscmd' (conflicts with 'kdelibs' from RHEL6) %if "%{?_prefix}" == "/usr" %exclude %{_bindir}/kjscmd -%endif %exclude %{_mandir}/man1/kjscmd* +%endif %files dcopperl -f %{name}-dcopperl.list @@ -274,13 +274,8 @@ update-desktop-database >& /dev/null ||: %{_libdir}/jni/*.so %{_libdir}/jni/*.la %endif -%if 0%{?fedora} >= 15 -%{_usr}/lib64/ruby/*/*/*.so -%{_usr}/lib64/ruby/*/*/*.la -%else -%{_usr}/lib64/ruby/*/*.so -%{_usr}/lib64/ruby/*/*.la -%endif +%{ruby_arch}/*.so +%{ruby_arch}/*.la %changelog * Sat Sep 03 2011 Francois Andriot Date: Sun, 30 Oct 2011 18:36:20 +0100 Subject: TDE 3.5.13 stable release for RHEL/Fedora --- redhat/kdebindings/trinity-kdebindings-3.5.13.spec | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) (limited to 'redhat/kdebindings/trinity-kdebindings-3.5.13.spec') diff --git a/redhat/kdebindings/trinity-kdebindings-3.5.13.spec b/redhat/kdebindings/trinity-kdebindings-3.5.13.spec index d395d44fb..7b1b74f69 100644 --- a/redhat/kdebindings/trinity-kdebindings-3.5.13.spec +++ b/redhat/kdebindings/trinity-kdebindings-3.5.13.spec @@ -2,7 +2,7 @@ %if "%{?version}" == "" %define version 3.5.13 %endif -%define release 0 +%define release 1 # If TDE is built in a specific prefix (e.g. /opt/trinity), the release will be suffixed with ".opt". %if "%{?_prefix}" != "/usr" @@ -29,11 +29,10 @@ Vendor: Trinity Project Packager: Francois Andriot URL: http://www.trinitydesktop.org/ -Source0: kdebindings-%{version}.tar.gz - Prefix: %{_prefix} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Source0: kdebindings-%{version}.tar.gz # RedHat Legacy patches (from Fedora) Patch1: kdebindings-3.5.6-libgcj.patch @@ -257,8 +256,8 @@ update-desktop-database >& /dev/null ||: # Excludes 'kjscmd' (conflicts with 'kdelibs' from RHEL6) %if "%{?_prefix}" == "/usr" %exclude %{_bindir}/kjscmd -%exclude %{_mandir}/man1/kjscmd* %endif +%exclude %{_mandir}/man1/kjscmd* %files dcopperl -f %{name}-dcopperl.list @@ -278,6 +277,9 @@ update-desktop-database >& /dev/null ||: %{ruby_arch}/*.la %changelog -* Sat Sep 03 2011 Francois Andriot - 3.5.13-1 +- Initial release for RHEL 6, RHEL 5 and Fedora 15 + +* Sat Sep 03 2011 Francois Andriot