rpms/kdebindings/F-7 kdebindings-3.5.6-libgcj.patch, NONE, 1.1 .cvsignore, 1.32, 1.33 kdebindings.spec, 1.69, 1.70 sources, 1.35, 1.36 kdebindings-3.5.3-libgcj.patch, 1.1, NONE
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Sat Nov 3 18:59:48 UTC 2007
Author: rdieter
Update of /cvs/pkgs/rpms/kdebindings/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31767
Modified Files:
.cvsignore kdebindings.spec sources
Added Files:
kdebindings-3.5.6-libgcj.patch
Removed Files:
kdebindings-3.5.3-libgcj.patch
Log Message:
* Sat Oct 13 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 3.5.8-1
- kde-3.5.8
kdebindings-3.5.6-libgcj.patch:
--- NEW FILE kdebindings-3.5.6-libgcj.patch ---
--- kdebindings-3.5.6/admin/acinclude.m4.in.libgcj 2007-01-15 17:16:52.000000000 -0600
+++ kdebindings-3.5.6/admin/acinclude.m4.in 2007-03-19 12:08:45.000000000 -0500
@@ -5261,7 +5261,18 @@
dnl Look for libjvm.so
kde_java_libjvmdir=`find $kde_java_bindir/.. -name libjvm.so | sed 's,libjvm.so,,'|head -n 1`
dnl Look for libgcj.so
- kde_java_libgcjdir=`find $kde_java_bindir/.. -name libgcj.so | sed 's,libgcj.so,,'|head -n 1`
+ if test -z "$PKG_CONFIG"; then
+ AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+ fi
+ if (`$PKG_CONFIG --exists libgcj-4.1`) ; then
+ JVMLIBS=`$PKG_CONFIG --libs libgcj-4.1`
+ kde_java_libgcjdir=`$PKG_CONFIG --variable=libdir libgcj-4.1`
+ elif (`$PKG_CONFIG --exists libgcj`) ; then
+ JVMLIBS=`$PKG_CONFIG --libs libgcj`
+ kde_java_libgcjdir=`$PKG_CONFIG --variable=libdir libgcj`
+ else
+ kde_java_libgcjdir=`find $kde_java_bindir/.. -name libgcj.so | sed 's,libgcj.so,,'|head -n 1`
+ fi
dnl Look for libhpi.so and avoid green threads
kde_java_libhpidir=`find $kde_java_bindir/.. -name libhpi.so | grep -v green | sed 's,libhpi.so,,' | head -n 1`
@@ -5302,10 +5313,6 @@
if test ! -r "$kde_java_libjvmdir/libjvm.so"; then
AC_MSG_ERROR([libjvm.so not found under $kde_java_libjvmdir. Use --without-java.])
fi
- else
- if test ! -r "$kde_java_libgcjdir/libgcj.so"; then
- AC_MSG_ERROR([libgcj.so not found under $kde_java_libgcjdir. Use --without-java.])
- fi
fi
if test ! -x "$kde_java_bindir/java"; then
@@ -5359,7 +5366,13 @@
if test "x$kde_java_libgcjdir" = "x"; then
JVMLIBS="-L$kde_java_libjvmdir -ljvm -L$kde_java_libhpidir -lhpi"
else
- JVMLIBS="-L$kde_java_libgcjdir -lgcj"
+ if test "x$JVMLIBS" = "x"; then
+ if test ! -r "$kde_java_libgcjdir/libgcj.so"; then
+ AC_MSG_ERROR([libgcj.so not found under $kde_java_libgcjdir. Use --without-java.])
+ else
+ JVMLIBS="-L$kde_java_libgcjdir -lgcj"
+ fi
+ fi
fi
AC_MSG_RESULT([java JDK in $kde_java_bindir])
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/F-7/.cvsignore,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- .cvsignore 11 Jun 2007 20:10:48 -0000 1.32
+++ .cvsignore 3 Nov 2007 18:59:15 -0000 1.33
@@ -1 +1,2 @@
kdebindings-3.5.7.tar.bz2
+kdebindings-3.5.8.tar.bz2
Index: kdebindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/F-7/kdebindings.spec,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -r1.69 -r1.70
--- kdebindings.spec 13 Jun 2007 21:58:30 -0000 1.69
+++ kdebindings.spec 3 Nov 2007 18:59:15 -0000 1.70
@@ -1,35 +1,29 @@
-%define kdelibs_epoch 6
-%define kdebase_epoch 6
-
Name: kdebindings
Summary: KDE bindings to non-C++ languages
-Version: 3.5.7
-Release: 1%{?dist}.1
+Version: 3.5.8
+Release: 1%{?dist}
-License: GPL
+License: GPLv2
Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
URL: http://developer.kde.org/language-bindings/
Group: User Interface/Desktops
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Patch1: kdebindings-3.5.3-libgcj.patch
+Patch1: kdebindings-3.5.6-libgcj.patch
BuildRequires: automake libtool
BuildRequires: desktop-file-utils
-BuildRequires: kdelibs-devel >= %{kdelibs_epoch}:%{version}
+BuildRequires: kdelibs3-devel >= %{version}
BuildRequires: zlib-devel
-BuildRequires: perl
-%if 0%{?fedora} > 6
-#BuildRequires: perl-devel
-%endif
+BuildRequires: perl(ExtUtils::MakeMaker)
%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)}
%define perl_man3dir %{expand:%%(eval `perl -V:installman3dir`; echo $installman3dir)}
-Requires: kdelibs >= %{kdelibs_epoch}:%{version}
-Requires: kdebase >= %{kdebase_epoch}:%{version}
+Requires: kdelibs3 >= %{version}
+Requires: kdebase3 >= %{version}
Requires(post): /sbin/ldconfig
Requires(posun): /sbin/ldconfig
@@ -46,13 +40,12 @@
%{!?ruby_sitelib: %define ruby_sitelib %(ruby -rrbconfig -e 'puts Config::CONFIG["sitelibdir"]')}
%{!?ruby_sitearch: %define ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"]')}
-%if 0
## java
-BuildRequires: java-1.5.0-gcj-devel libgcj-devel gcc-java
-%define java_home %{_prefix}/lib/jvm/java-gcj/
+#BuildRequires: java-1.4.2-gcj-compat-devel libgcj-devel gcc-java
+BuildRequires: java-devel >= 1.4.2
+%define java_home %{_prefix}/lib/jvm/java
%define _with_java --with-java=%{java_home}
Provides: %{name}-java = %{version}-%{release}
-%endif
%description
KDE/DCOP bindings to non-C++ languages
@@ -61,7 +54,7 @@
Summary: Development files for %{name}
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
-Requires: kdelibs-devel
+Requires: kdelibs3-devel
%description devel
Development files for the KDE bindings.
@@ -69,7 +62,6 @@
%package dcopperl
Summary: DCOP Bindings for Perl
Group: Development/Libraries
-Provides: perl-DCOP = 0.1
%description dcopperl
Perl bindings to the DCOP interprocess communication protocol used by KDE
@@ -100,15 +92,16 @@
--with-extra-libs=%{_libdir} \
--disable-final \
%{?_with_java} %{!?_with_java:--without-java} \
- %{?_enable_qscintilla} %{!?_enable_qcsintilla:--disable-qsintilla}
+ %{?_enable_qscintilla} %{!?_enable_qscintilla:--disable-qscintilla}
pushd dcopperl
CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL INSTALLDIRS=vendor
make OPTIMIZE="$RPM_OPT_FLAGS" ||:
popd
-# apparently not completely smp-safe (smoke/)
-make #%{?_smp_mflags}
+# smoke/ not smp-safe
+make -C smoke/
+make %{?_smp_mflags} PYTHON=%{__python}
%install
@@ -181,7 +174,7 @@
%files -f %{name}.lang
%defattr(-,root,root,-)
-%doc AUTHORS COPYING* README
+%doc AUTHORS COPYING README
%doc rpmdocs/*
%{_bindir}/*
%{_libdir}/kde3/*
@@ -215,8 +208,21 @@
%changelog
-* Wed Jun 13 2007 Than Ngo <than at redhat.com> - 3.5.7-1.fc7.1
-- disable java
+* Sat Oct 13 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 3.5.8-1
+- kde-3.5.8
+
+* Thu Aug 23 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 3.5.7-5
+- smoke/ not smp-safe (using make -j)
+
+* Sat Aug 11 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 3.5.7-4
+- BR: kdelibs3-devel, perl(ExtUtils::MakeMaker)
+- License: GPLv2
+
+* Wed Aug 01 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 3.5.7-3
+- -dcopperl: drop Provides: perl-DCOP , a versioned perl(DCOP) is there already.
+
+* Mon Jun 18 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 3.5.7-2
+- updated libgcl.patch
* Mon Jun 11 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 3.5.7-1
- 3.5.7
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/F-7/sources,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- sources 11 Jun 2007 20:10:48 -0000 1.35
+++ sources 3 Nov 2007 18:59:15 -0000 1.36
@@ -1 +1 @@
-bc8a95f0cfd52ad0559a775cf045f230 kdebindings-3.5.7.tar.bz2
+4325d22ac70d3945609bd952c19e793b kdebindings-3.5.8.tar.bz2
--- kdebindings-3.5.3-libgcj.patch DELETED ---
More information about the fedora-extras-commits
mailing list