|
|
Author: than
Update of /cvs/dist/rpms/kdebindings/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv8981
Modified Files:
kdebindings.spec
Added Files:
kdebindings-3.5.3-libgcj.patch
Log Message:
cleanup
kdebindings-3.5.3-libgcj.patch:
acinclude.m4.in | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
--- NEW FILE kdebindings-3.5.3-libgcj.patch ---
--- kdebindings-3.5.3/admin/acinclude.m4.in.libgcj 2006-05-23
07:54:05.000000000 -0500
+++ kdebindings-3.5.3/admin/acinclude.m4.in 2006-06-06 14:38:46.000000000
-0500
@@ -5264,7 +5264,15 @@
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`) ; 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`
@@ -5305,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
@@ -5362,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: kdebindings.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebindings/devel/kdebindings.spec,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -r1.63 -r1.64
--- kdebindings.spec 7 Feb 2007 23:38:50 -0000 1.63
+++ kdebindings.spec 8 Mar 2007 12:50:47 -0000 1.64
@@ -1,73 +1,56 @@
-%define debug 0
-%define final 0
-
-%define appdir %{_datadir}/applications/kde
-
-%{expand: %%define pythonver %(python -c 'import sys;print(sys.version[0:3])')}
-
-%define qt_version 3.3.7
-%define arts_version 1.5.6
%define kdelibs_epoch 6
%define kdebase_epoch 6
-%define perlver 5.8
-%define perlepoch 3
-%define rubyver 1.8
-
-%define arts 1
-%define perl 1
-%define python 1
-%define ruby 1
-%define pyqt 0
-Version: 3.5.6
-Release: 1%{?dist}
-Name: kdebindings
+Name: kdebindings
Summary: KDE bindings to non-C++ languages
-URL: http://www.kde.org/
+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/
License: GPL
Group: User Interface/Desktops
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source:
ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
-
-Patch4: kdebindings-3.1-ssl-krb5.patch
-Patch6: kdebindings-3.1-python2.5.patch
-Patch8: kdebindings-3.3.0-python.patch
-Patch9: kdebindings-3.3.92-xdg.patch
-# upstream patches
-Patch100: kdebindings-3.5.6-python25.patch
+Patch1: kdebindings-3.5.3-libgcj.patch
+Patch2: kdebindings-3.5.6-python25.patch
-BuildRequires: zlib-devel
-BuildRequires: kdelibs-devel
-BuildRequires: arts-devel
-BuildRequires: libjpeg-devel
-BuildRequires: libpng-devel
BuildRequires: automake
-BuildRequires: autoconf
-BuildRequires: libtool
BuildRequires: desktop-file-utils
-
-%if %{perl}
-BuildRequires: perl >= %{perlver}
-Requires: perl >= %{perlepoch}:%{perlver}
-%endif
-
-%if %{python}
-BuildRequires: python >= %{pythonver}
-BuildRequires: python-devel >= %{pythonver}
-Requires: python-abi = %{pythonver}
-%endif
-
-%if %{ruby}
-BuildRequires: ruby >= %{rubyver}
-BuildRequires: ruby-devel >= %{rubyver}
-Requires: ruby >= %{rubyver}
+BuildRequires: qt-devel
+BuildRequires: kdelibs-devel >= %{kdelibs_epoch}:%{version}
+BuildRequires: zlib-devel
+BuildRequires: perl
+%if 0%{?fedora} > 6
+BuildRequires: perl-devel
%endif
+%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(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
Requires: kdelibs >= %{kdelibs_epoch}:%{version}
-Requires: kdebase >= %{kdebase_epoch}:%{version}
+Requires: kdebase >= %{kdebase_epoch}:%{version}
+Requires(post): /sbin/ldconfig xdg-utils
+Requires(posun): /sbin/ldconfig xdg-utils
+
+%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)")
+
+## dcoppython
+BuildRequires: python-devel
+Provides: %{name}-dcoppython = %{version}-%{release}
+
+## ruby
+BuildRequires: ruby-devel >= 1.8, ruby
+Provides: %{name}-ruby = %{version}-%{release}
+%{!?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
+%define java_home %{_prefix}/lib/jvm/java-1.4.2
+%define _with_java --with-java=%{java_home}
+Provides: %{name}-java = %{version}-%{release}
%description
KDE/DCOP bindings to non-C++ languages
@@ -76,171 +59,194 @@
Summary: Development files for %{name}
Group: Development/Libraries
Requires: %{name} = %{version}-%{release}
-Requires: kdelibs-devel >= %{kdelibs_epoch}:%{version}
-
+Requires: kdelibs-devel
%description devel
Development files for the KDE bindings.
-Install %{name}-devel if you want to develop non-KDE
-applications that talk to KDE.
-
-%package perl
-Summary: Perl bindings to DCOP
-Group: Development/Libraries
-Requires: kdelibs >= %{kdelibs_epoch}:%{version}
-Requires: perl >= %{perlver}
-
-%description perl
+## dcopperl
+%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
-%package python
-Summary: Python bindings to DCOP
-Group: Development/Libraries
-Requires: kdelibs >= %{kdelibs_epoch}:%{version}
-Requires: python-abi = %{pythonver}
-
-%description python
-Python bindings to the DCOP interprocess communication protocol used by KDE
%prep
%setup -q
-%patch4 -p1 -b .ssl-krb5
-%patch6 -p1 -b .python2
-# don't build sip/pyqt, we have separates packages
-%if %{pyqt} == 0
-%patch8 -p1 -b .python
-rm -rf python
-%endif
-%patch9 -p1 -b .xdg
-%patch100 -p0 -b .python25
+%patch1 -p1 -b .libgcj
+%patch2 -p1 -b .python25
+
+make -f admin/Makefile.common
+
%build
-unset QTDIR && . /etc/profile.d/qt.sh
+unset QTDIR || : ; source /etc/profile.d/qt.sh
-make -f admin/Makefile.common cvs
+unset JAVA_HOME ||:
+%{?java_home:JAVA_HOME=%{java_home}; export JAVA_HOME}
-suffix=""
-if [ "%{_lib}" == "lib64" ] ; then
- suffix="64"
-fi
+# sip/PyQt/PyKDE built separately, not here
+export DO_NOT_COMPILE="$DO_NOT_COMPILE python"
%configure \
- --enable-new-ldflags \
- --disable-dependency-tracking \
- --disable-rpath \
- --enable-libsuffix="$suffix" \
- --includedir=%{_includedir}/kde \
- --with-qt-libraries=$QTDIR/lib \
- --disable-gcc-hidden-visibility \
-%if %{arts} == 0
- --without-arts \
-%endif
-%if %{final}
- --enable-final \
-%endif
-%if %{debug} == 0
- --disable-debug \
- --disable-warnings \
-%endif
- --without-java
+ --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}
+
+pushd dcopperl
+CFLAGS="$RPM_OPT_FLAGS" perl Makefile.PL INSTALLDIRS=vendor
+make OPTIMIZE="$RPM_OPT_FLAGS" ||:
+popd
+
+# apparently not completely smp-safe (smoke/)
+make -k %{?_smp_mflags} PYTHON=%{__python} \
+ || make PYTHON=%{__python}
-make #%{?_smp_mflags}
%install
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
-make install DESTDIR=%{buildroot}
+make install DESTDIR=$RPM_BUILD_ROOT \
+ PYTHON=%{__python}
desktop-file-install \
- --vendor "" \
- --dir %{buildroot}%{appdir} \
- --delete-original \
- --add-only-show-in KDE \
- %{buildroot}%{appdir}/kjscmd.desktop \
- %{buildroot}%{appdir}/embedjs.desktop
+ --vendor="" \
+ --add-category="Qt" \
+ --add-category="KDE" \
+ --add-category="Utility" \
+ --dir $RPM_BUILD_ROOT%{_datadir}/applications/kde \
+ $RPM_BUILD_ROOT%{_datadir}/applnk/Utilities/*.desktop ||:
+
+## File lists
+# perl
+find $RPM_BUILD_ROOT -type f -a \( -name perllocal.pod -o -name .packlist \
+ -o \( -name '*.bs' -a -empty \) \) -exec rm -f {} ';'
+
+find $RPM_BUILD_ROOT%{perl_vendorarch} -type f -print | \
+ sed "s@^$RPM_BUILD_ROOT@@g" >> %{name}-dcopperl.list
+find $RPM_BUILD_ROOT%{perl_vendorlib} -type f -print | \
+ sed "s@^$RPM_BUILD_ROOT@@g" >> %{name}-dcopperl.list
+if [ "$(cat %{name}-dcopperl.list)X" = "X" ] ; then
+ echo "ERROR: EMPTY FILE LIST"; exit 1
+fi
+
+# locale's
+%find_lang %{name} || touch %{name}.lang
+HTML_DIR=$(kde-config --expandvars --install html)
+if [ -d $RPM_BUILD_ROOT$HTML_DIR ]; then
+for lang_dir in $RPM_BUILD_ROOT$HTML_DIR/* ; do
+ if [ -d $lang_dir ]; then
+ lang=$(basename $lang_dir)
+ echo "%lang($lang) $HTML_DIR/$lang/*" >> %{name}.lang
+ # replace absolute symlinks with relative ones
+ pushd $lang_dir
+ for i in *; do
+ [ -d $i -a -L $i/common ] && ln -nsf ../common $i/common
+ done
+ popd
+ fi
+done
+fi
+
+# rpmdocs
+for dir in dcopperl dcoppython kalyptus %{?_with_java:kdejava qtjava} kjsembed
korundum qtruby qtsharp smoke; do
+ for file in AUTHORS ChangeLog README TODO ; do
+ test -s "$dir/$file" && install -p -m644 -D "$dir/$file"
"rpmdocs/$dir/$file"
+ done
+done
%clean
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
%post
-/sbin/ldconfig
-touch --no-create %{_datadir}/icons/hicolor 2> /dev/null ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+/sbin/ldconfig ||:
+%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+%{_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || :
%postun
-/sbin/ldconfig
-touch --no-create %{_datadir}/icons/hicolor 2> /dev/null ||:
-gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
-update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
-
-%files
-%defattr(-,root,root)
-%{_libdir}/*.so.*
-%{_libdir}/*.la
+/sbin/ldconfig ||:
+%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
+%{_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || :
+
+
+%files -f %{name}.lang
+%defattr(-,root,root,-)
+%doc AUTHORS COPYING* README
+%doc rpmdocs/*
+%{_bindir}/*
%{_libdir}/kde3/*
-%{_datadir}/applications/kde/*
-%{_datadir}/apps/embedjs
+%{_libdir}/lib*.la
+%{_libdir}/lib*.so.*
+%{_datadir}/appl*/*/*.desktop
+%{_datadir}/apps/embedjs/
%{_datadir}/apps/kate/scripts/*
-%{_datadir}/apps/kjsembed
-%{_datadir}/icons/*/*/*/*
-%{_datadir}/services/*
-%{_datadir}/servicetypes/*
-%{_bindir}/*
-%if %{ruby}
-%{_prefix}/lib*/ruby/site_ruby/%{rubyver}/*
-%endif
-%if %{python}
-%{_libdir}/python*/*
+%{_datadir}/apps/kjsembed/
+%{_datadir}/icons/hicolor/*/*/*
+%{_datadir}/service*/*.desktop
+%{_mandir}/man1/*
+%{python_sitearch}/*
+%{_libdir}/python%{python_ver}/*.py*
+%if "%{?_with_java:1}" == "1"
+%{_libdir}/java
%endif
-%{_libdir}/perl5
+%{ruby_sitearch}/*
+%{ruby_sitelib}/K*
+%{ruby_sitelib}/Qt*
+
+%files dcopperl -f %{name}-dcopperl.list
+%defattr(-,root,root,-)
+%doc dcopperl/AUTHORS dcopperl/Changes dcopperl/README dcopperl/TODO
+%{perl_man3dir}/DCOP.3pm.gz
%files devel
-%defattr(-,root,root)
+%defattr(-,root,root,-)
%{_includedir}/kde/*
-%{_libdir}/*.so
-%{_mandir}/man*/*
+%{_libdir}/lib*.so
-%changelog
-* Thu Feb 08 2007 Than Ngo <than@xxxxxxxxxx> - 3.5.6-1.fc7
-- 3.5.6
-* Thu Dec 14 2006 Karsten Hopp <karsten@xxxxxxxxxx> 3.5.5-4
-- use correct types
-
-* Tue Dec 12 2006 Karsten Hopp <karsten@xxxxxxxxxx> 3.5.5-3
-- fix automake check
-
-* Thu Dec 7 2006 Jeremy Katz <katzj@xxxxxxxxxx> - 3.5.5-2
-- rebuild for python 2.5
+%changelog
+* Thu Mar 08 2007 Than Ngo <than@xxxxxxxxxx> - 3.5.6-4
+- cleanup specfile
-* Tue Nov 14 2006 Than Ngo <than@xxxxxxxxxx> - 3.5.5-1.fc7
-- rebuild
+* Wed Mar 07 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.5.6-3
+- move perl BR: bits up with the rest
+- drop unused patch
+
+* Tue Mar 06 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.5.6-2
+- update URL
+- drop %%debug macro
+- drop %%perl_install_root hack
+- drop sip/PyQt/PyKDE optional inclusion
+- Requires(post,postun): xdg-utils
-* Wed Nov 08 2006 Than Ngo <than@xxxxxxxxxx> 3.5.5-0.2.fc6
-- fix #196311, should not own /usr/lib/python2.4
+* Tue Jan 16 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 3.5.6-1
+- kde-3.5.6
-* Thu Oct 26 2006 Than Ngo <than@xxxxxxxxxx> 3.5.5-0.1
+* Thu Oct 05 2006 Rex Dieter <rexdieter[AT]users.sf.net> 3.5.5-1
- 3.5.5
-* Thu Aug 10 2006 Than Ngo <than@xxxxxxxxxx> 3.5.4-1
-- rebuild
-
-* Wed Jul 26 2006 Petr Rockai <prockai@xxxxxxxxxx> - 3.5.4-0.pre2
-- drop the gcc/g++ workaround, fixed in gcc already
-
-* Mon Jul 24 2006 Petr Rockai <prockai@xxxxxxxxxx> - 3.5.4-0.pre1
-- prerelease of 3.5.4 (from the first-cut tag)
-
-* Tue Jul 18 2006 Petr Rockai <prockai@xxxxxxxxxx> 3.5.3-3
-- fix compilation with gcc/g++ 4.1.1-8
-
-* Mon Jul 17 2006 Than Ngo <than@xxxxxxxxxx> 3.5.3-2
-- rebuild
+* Tue Jul 25 2006 Rex Dieter <rexdieter[AT]users.sf.net> 3.5.4-1
+- kde-3.5.4
-* Sat Jun 03 2006 Than Ngo <than@xxxxxxxxxx> 3.5.3-1
-- update to 3.5.3
+* Mon Jun 05 2006 Rex Dieter <rexdieter[AT]users.sf.net> 3.5.3-2.1
+- cleanup for Extras
+- %%doc: AUTHORS COPYING README, app docs (README, TODO, etc...)
+- follow icon spec
+- -dcopperl: subpkg, since kdesdk (now) Requires: perl(DCOP)
+- -dcopperl: use perl's values of installman3dir,installvendorlib
+- -dcoppython: enable even if not packaging sip/PyQt
+- sip/PyQT/PyKDE: Provides -> Conflicts (to have the ability
+ to install/use either one).
+- add (virtual) Provides: %%name-{java,perl,python,ruby}
* Tue May 23 2006 Than Ngo <than@xxxxxxxxxx> 3.5.2-2
- fix build problem with ruby
--
fedora-cvs-commits mailing list
fedora-cvs-commits@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/fedora-cvs-commits
|
|