diff --git a/.cvsignore b/.cvsignore index 6b56aab..66c5bdd 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -kdebindings-3.0.3.tar.bz2 +kdebindings-3.0.5a.tar.bz2 diff --git a/kdebindings.spec b/kdebindings.spec index 36184da..9434e17 100644 --- a/kdebindings.spec +++ b/kdebindings.spec @@ -1,34 +1,81 @@ -%define is_release 1 -%define beta %{nil} -%define rel 1 -%define DATE 20020613 -Version: 3.0.3 +%define build_release 0 +%define build_beta 1 +%define build_snapshot 2 + +%define isClean 1 + +%define isBuild %{build_release} + +%define debug 0 + +%define release_number 1 + +%define build_for_ftp 0 + +%define strip_bin 0 +%define final 0 +%define rpm_clean 1 + +%define desktop_file 1 +%define desktop_file_utils_version 0.2.93 + +%define support_arch "%{ix86} alpha ia64 ppc" + +%define qt_version 3.0.5 + +%define perl 0 +%define python 0 + +%define libtool 1 + +Version: 3.0.5a Name: kdebindings -%if %{is_release} -%if "%{beta}" != "" -Release: 0.%{beta}.%{rel} -Source: %{name}-%{version}-%{beta}.tar.bz2 -%else -Release: %{rel} -Source: %{name}-%{version}.tar.bz2 -%endif -%else -Release: 0.cvs%{DATE}.%{rel} -Source: %{name}-%{DATE}.tar.bz2 -%endif -Patch: kdebindings-3.0.0-gcjjava.patch -Patch1: kdebindings-3.0.0-qtjava-package.patch -Patch2: kdebindings-automake.patch -Patch3: kdebindings-3.0.2-broken.patch -Patch4: kdebindings-3.0.2-mozilla.patch Summary: KDE bindings to non-C++ languages URL: http://www.kde.org/ License: GPL Group: User Interface/Desktops Prefix: %{_prefix} BuildRoot: %{_tmppath}/%{name}-root -BuildRequires: zlib-devel kdelibs-devel kdelibs-sound-devel libjpeg-devel libpng-devel automake15 -Requires: kdelibs >= 3.0.2 kdebase >= 3.0.2 + +%if "%{isBuild}" == "%{build_release}" +%define release_name %{nil} +Release: %{release_number} +Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/distribution/tar/generic/source/%{name}-%{version}.tar.bz2 +%endif + +%if "%{isBuild}" == "%{build_beta}" +%define release_name beta1 +Release: 0.%{release_name}.%{release_number} +Source: ftp://ftp.kde.org/pub/kde/stable/%{version}/distribution/tar/generic/source/%{name}-%{release_name}.tar.bz2 +%endif + +%if "%{isBuild}" == "%{build_snapshot}" +%define release_name 20020807 +Release: 0.%{release_name}cvs.%{release_number} +Source: cvs://cvs.kde.org/%{name}-%{release_name}.tar.bz2 +%endif + +%if %{build_for_ftp} +ExclusiveArch: %{ix86} +%endif + +Patch0: kdebindings-3.0.0-gcjjava.patch +Patch1: kdebindings-3.0.0-qtjava-package.patch +Patch2: kdebindings-automake.patch +Patch3: kdebindings-3.0.2-broken.patch +Patch4: kdebindings-3.0.2-mozilla.patch + +BuildRequires: zlib-devel +BuildRequires: kdelibs-devel >= 3.0.3 +BuildRequires: arts-devel +BuildRequires: libjpeg-devel +BuildRequires: libpng-devel +BuildRequires: automake15 + +Requires: kdelibs >= %{version} +Requires: kdebase >= %{version} + +Prereq: /sbin/ldconfig %description KDE/DCOP bindings to non-C++ languages @@ -37,6 +84,7 @@ KDE/DCOP bindings to non-C++ languages Summary: Development files for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} +Requires: kdelibs-devel >= %{version} %description devel Development files for the KDE bindings. @@ -44,11 +92,12 @@ Development files for the KDE bindings. Install %{name}-devel if you want to develop non-KDE applications that talk to KDE. -%ifarch i386 +%ifarch %{ix86} ppc alpha %package kmozilla Summary: KDE bindings to mozilla Group: User Interface/Desktops -Requires: mozilla kdebase >= 3.0.0 +Requires: mozilla +Requires: kdebase >= %{version} %description kmozilla @@ -58,7 +107,8 @@ KDE bindings to mozilla - embed Mozilla in Konqueror %package perl Summary: Perl bindings to DCOP Group: Development/Libraries -Requires: kdelibs >= %{version}, perl >= 5.6.0 +Requires: kdelibs >= %{version} +Requires: perl >= 5.6.0 %description perl Perl bindings to the DCOP interprocess communication protocol used by KDE @@ -66,24 +116,31 @@ Perl bindings to the DCOP interprocess communication protocol used by KDE %package python Summary: Python bindings to DCOP Group: Development/Libraries -Requires: kdelibs >= %{version}, python >= 2.2 +Requires: kdelibs >= %{version} +Requires: python >= 2.2 %description python -Perl bindings to the DCOP interprocess communication protocol used by KDE +Python bindings to the DCOP interprocess communication protocol used by KDE +%ifarch %{support_arch} %package qtjava Summary: Java bindings to Qt Group: System Environment/Libraries -Requires: qt >= 3.0.2, libgcj >= 3.1, jdkgcj >= 0.2.2 -BuildRequires: gcc-java >= 3.1, libgcj >= 3.1, jdkgcj >= 0.2.2 +Requires: qt >= %{qt_version} +Requires: libgcj >= 3.1 +Requires: jdkgcj >= 0.2.2 +BuildRequires: gcc-java >= 3.1 +BuildRequires: libgcj >= 3.1 +BuildRequires: jdkgcj >= 0.2.2 %description qtjava Java bindings to Qt. +%endif %package qtc Summary: C bindings to Qt Group: System Environment/Libraries -Requires: qt >= 3.0.2 +Requires: qt >= %{qt_version} %description qtc C bindings to Qt. @@ -93,45 +150,68 @@ in C (rather than C++). %package kdec Summary: C bindings to KDE Group: System Environment/Libraries -Requires: qt >= 3.0.2 %{name}-qtc >= 3.0.2 +Requires: qt >= %{qt_version} +Requires: %{name}-qtc >= 3.0.2 %description kdec C bindings to KDE. Install kdebindings-kdec if you wish to develop Qt applications in C (rather than C++). +%ifarch %{support_arch} %package kdejava Summary: Java bindings to KDE Group: Development/Libraries -Requires: kdelibs >= %{version}, kdebindings-qtjava = %{version}-%{release}, libgcj +Requires: kdelibs >= %{version} +Requires: kdebindings-qtjava = %{version}-%{release} +Requires: libgcj %description kdejava Java bindings to KDE +%endif %prep -%if %{is_release} +rm -rf $RPM_BUILD_ROOT + +%if "%{isBuild}" == "%{build_release}" %setup -q %else -%setup -q -n %{name} +%setup -q -n %{name}-%{version}-%{release_name} %endif + %patch -p1 -b .gcj %patch1 -p1 -b .package %patch2 -p1 -b .automake %patch3 -p1 -b .broken %patch4 -p1 -b .mozilla -make -f Makefile.cvs -unset QTDIR || : -. /etc/profile.d/qt.sh +%build +unset QTDIR && . /etc/profile.d/qt.sh + +# Workaround for legacy auto* tools +%if %{libtool} +[ -x /usr/bin/autoconf-2.5? ] && ln -s /usr/bin/autoconf-2.5? autoconf +[ -x /usr/bin/autoheader-2.5? ] && ln -s /usr/bin/autoheader-2.5? autoheader +[ -x /usr/bin/aclocal-1.5 ] && ln -s /usr/bin/aclocal-1.5 aclocal +[ -x /usr/bin/automake-1.5 ] && ln -s /usr/bin/automake-1.5 automake +export PATH=`pwd`:$PATH +make -f admin/Makefile.common cvs +%endif -%configure --includedir=%{_includedir}/kde --with-java=/usr +export CFLAGS="$RPM_OPT_FLAGS -fno-use-cxa-atexit" +export CXXFLAGS="$RPM_OPT_FLAGS -fno-use-cxa-atexit" -%build -unset QTDIR || : -. /etc/profile.d/qt.sh +%configure \ + --includedir=%{_includedir}/kde \ +%ifarch %{support_arch} + --with-java=%{prefix} +%else + --without-java +%endif make %{?smp_mflags} -%if 0 + +%if %{perl} cd dcopperl perl Makefile.PL < 3.0.5a-1 +- update to 3.0.5a + +* Sun Nov 10 2002 Than Ngo 3.0.5-1 +- update to 3.0.5 + +* Thu Nov 7 2002 Than Ngo 3.0.4-2 +- cleaned up specfile + +* Tue Oct 15 2002 Than Ngo 3.0.4-1 +- 3.0.4 + +* Thu Sep 19 2002 Than Ngo 3.0.3-1.1 +- Added missing requires kdelibs-devel in kdebindings-devel (bug #73992) +- Fixed typo bug (bug #51669) +- Added Buildprereq arts-devel instead kdelibs-sound +- Fixed to build on s390/s390x/x86_64 + * Mon Aug 12 2002 Than Ngo 3.0.3-1 - 3.0.3 - build using gcc-3.2-0.3 diff --git a/sources b/sources index 27ef6ff..1b589c8 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -b641cbc106e221ab9a071bcc9e06b14b kdebindings-3.0.3.tar.bz2 +70d084a1ad42456b33871bf0ef9e8887 kdebindings-3.0.5a.tar.bz2