rpms/kdebindings/devel kdebindings-3.5.6-libgcj.patch, NONE, 1.1 .cvsignore, 1.31, 1.32 kdebindings.spec, 1.66, 1.67 sources, 1.34, 1.35 kdebindings-3.1-python2.5.patch, 1.2, NONE kdebindings-3.1-ssl-krb5.patch, 1.1, NONE kdebindings-3.3.0-python.patch, 1.1, NONE kdebindings-3.3.92-xdg.patch, 1.2, NONE kdebindings-3.5.3-libgcj.patch, 1.1, NONE kdebindings-3.5.6-python25.patch, 1.1, NONE
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Mon Jun 18 14:00:09 UTC 2007
Author: rdieter
Update of /cvs/pkgs/rpms/kdebindings/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14000
Modified Files:
.cvsignore kdebindings.spec sources
Added Files:
kdebindings-3.5.6-libgcj.patch
Removed Files:
kdebindings-3.1-python2.5.patch kdebindings-3.1-ssl-krb5.patch
kdebindings-3.3.0-python.patch kdebindings-3.3.92-xdg.patch
kdebindings-3.5.3-libgcj.patch
kdebindings-3.5.6-python25.patch
Log Message:
* 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
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/devel/.cvsignore,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -r1.31 -r1.32
--- .cvsignore 10 Aug 2006 12:23:53 -0000 1.31
+++ .cvsignore 18 Jun 2007 13:59:33 -0000 1.32
@@ -1,13 +1 @@
-kdebindings-3.3.0.tar.bz2
-kdebindings-3.3.1.tar.bz2
-kdebindings-3.3.2.tar.bz2
-kdebindings-3.4.0-rc1.tar.bz2
-kdebindings-3.4.0.tar.bz2
-kdebindings-3.4.1.tar.bz2
-kdebindings-3.4.2.tar.bz2
-kdebindings-3.4.91.tar.bz2
-kdebindings-3.4.92.tar.bz2
-kdebindings-3.5.0.tar.bz2
-kdebindings-3.5.1.tar.bz2
-kdebindings-3.5.3.tar.bz2
-kdebindings-3.5.4.tar.bz2
+kdebindings-3.5.7.tar.bz2
Index: kdebindings.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/devel/kdebindings.spec,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -r1.66 -r1.67
--- kdebindings.spec 12 Mar 2007 09:07:51 -0000 1.66
+++ kdebindings.spec 18 Jun 2007 13:59:33 -0000 1.67
@@ -1,22 +1,22 @@
+
%define kdelibs_epoch 6
%define kdebase_epoch 6
Name: kdebindings
Summary: KDE bindings to non-C++ languages
-Version: 3.5.6
-Release: 3%{?dist}
-Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
-URL: http://developer.kde.org/language-bindings/
+Version: 3.5.7
+Release: 2%{?dist}
+
License: GPL
-Group: User Interface/Desktops
+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
-Patch2: kdebindings-3.5.6-python25.patch
+Patch1: kdebindings-3.5.6-libgcj.patch
-BuildRequires: automake
+BuildRequires: automake libtool
BuildRequires: desktop-file-utils
-BuildRequires: qt-devel
BuildRequires: kdelibs-devel >= %{kdelibs_epoch}:%{version}
BuildRequires: zlib-devel
BuildRequires: perl
@@ -30,8 +30,8 @@
Requires: kdelibs >= %{kdelibs_epoch}:%{version}
Requires: kdebase >= %{kdebase_epoch}:%{version}
-Requires(post): /sbin/ldconfig xdg-utils
-Requires(posun): /sbin/ldconfig xdg-utils
+Requires(post): /sbin/ldconfig
+Requires(posun): /sbin/ldconfig
%define python_ver %{expand:%%(%{__python} -c "import sys ; print sys.version[:3]")}
%define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")
@@ -47,8 +47,9 @@
%{!?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
-%define java_home %{_prefix}/lib/jvm/java-1.4.2-gcj-1.4.2.0
+#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}
@@ -76,7 +77,6 @@
%setup -q
%patch1 -p1 -b .libgcj
-%patch2 -p0 -b .python25
make -f admin/Makefile.common
@@ -93,14 +93,13 @@
%configure \
--includedir=%{_includedir}/kde \
--disable-rpath \
- --disable-gcc-hidden-visibility \
--enable-new-ldflags \
--disable-debug --disable-warnings \
--disable-dependency-tracking \
--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
@@ -169,13 +168,15 @@
%post
/sbin/ldconfig ||:
-%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-%{_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || :
+touch --no-create %{_datadir}/icons/hicolor ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+update-desktop-database >& /dev/null ||:
%postun
/sbin/ldconfig ||:
-%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-%{_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || :
+touch --no-create %{_datadir}/icons/hicolor ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+update-desktop-database >& /dev/null ||:
%files -f %{name}.lang
@@ -214,6 +215,12 @@
%changelog
+* 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
+
* Thu Mar 08 2007 Than Ngo <than at redhat.com> - 3.5.6-4
- cleanup specfile
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdebindings/devel/sources,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- sources 7 Feb 2007 23:38:50 -0000 1.34
+++ sources 18 Jun 2007 13:59:33 -0000 1.35
@@ -1 +1 @@
-d26b5f54f062b765a949d66657c2ab3c kdebindings-3.5.6.tar.bz2
+bc8a95f0cfd52ad0559a775cf045f230 kdebindings-3.5.7.tar.bz2
--- kdebindings-3.1-python2.5.patch DELETED ---
--- kdebindings-3.1-ssl-krb5.patch DELETED ---
--- kdebindings-3.3.0-python.patch DELETED ---
--- kdebindings-3.3.92-xdg.patch DELETED ---
--- kdebindings-3.5.3-libgcj.patch DELETED ---
--- kdebindings-3.5.6-python25.patch DELETED ---
More information about the fedora-extras-commits
mailing list