rpms/kdebindings/FC-5 kdebindings.spec,1.42,1.43 sources,1.30,1.31

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Sat Jun 10 14:43:11 UTC 2006


Author: than

Update of /cvs/dist/rpms/kdebindings/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv13848

Modified Files:
	kdebindings.spec sources 
Log Message:
update to 3.5.3



Index: kdebindings.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebindings/FC-5/kdebindings.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- kdebindings.spec	5 Apr 2006 15:37:41 -0000	1.42
+++ kdebindings.spec	10 Jun 2006 14:43:08 -0000	1.43
@@ -3,18 +3,11 @@
 
 %define appdir %{_datadir}/applications/kde
 
-## stil need fix to build java -> disable java at the moment
-##define support_arch %{ix86} alpha ia64 ppc
-%define support_arch none
-
-%define mozilla_archs %{ix86} ppc s390 s390x x86_64
-
-%define mozilla_version 1.7.10
+%{expand: %%define pythonver %(python -c 'import sys;print(sys.version[0:3])')}
 %define qt_version 3.3.5
-%define arts_version 1.5.1
+%define arts_version 1.5.3
 %define kdelibs_epoch 6
 %define kdebase_epoch 6
-%define pythonver 2.4
 %define perlver 5.8
 %define perlepoch 3
 %define rubyver 1.8
@@ -27,7 +20,7 @@
 
 %define disable_gcc_check_and_hidden_visibility 1
 
-Version: 3.5.2
+Version: 3.5.3
 Release: 0.1.fc5
 Name: kdebindings
 Summary: KDE bindings to non-C++ languages
@@ -45,12 +38,7 @@
 Patch8: kdebindings-3.3.0-python.patch
 Patch9: kdebindings-3.3.92-xdg.patch
 
-BuildRequires: zlib-devel
-BuildRequires: kdelibs-devel
-BuildRequires: arts-devel
-BuildRequires: libjpeg-devel
-BuildRequires: libpng-devel
-BuildRequires: automake
+BuildRequires: kdelibs-devel >= %{kdelibs_epoch}:%{version}
 BuildRequires: /usr/bin/desktop-file-install
 
 %if %{perl}
@@ -89,22 +77,11 @@
 Install %{name}-devel if you want to develop non-KDE
 applications that talk to KDE.
 
-%ifarch %{mozilla_archs}
-%package kmozilla
-Summary: KDE bindings to mozilla
-Group: User Interface/Desktops
-Requires: mozilla
-Requires: kdebase >= %{kdebase_epoch}:%{version}
-
-%description kmozilla
-KDE bindings to mozilla - embed Mozilla in Konqueror
-%endif
-
 %package perl
 Summary: Perl bindings to DCOP
 Group: Development/Libraries
 Requires: kdelibs >= %{kdelibs_epoch}:%{version}
-Requires: perl >= 5.6.0
+Requires: perl >= %{perlver}
 
 %description perl
 Perl bindings to the DCOP interprocess communication protocol used by KDE
@@ -118,54 +95,6 @@
 %description python
 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 >= %{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 >= 1:%{qt_version}
-
-%description qtc
-C bindings to Qt.
-Install kdebindings-qtc if you wish to develop Qt applications
-in C (rather than C++).
-
-%package kdec
-Summary: C bindings to KDE
-Group: System Environment/Libraries
-Requires: qt >= 1:%{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 >= %{kdelibs_epoch}:%{version}
-Requires: kdebindings-qtjava = %{version}-%{release}
-Requires: libgcj
-
-%description kdejava
-Java bindings to KDE
-%endif
-
 %prep
 %setup -q
 %patch4 -p1 -b .ssl-krb5
@@ -182,22 +111,6 @@
 %build
 unset QTDIR && . /etc/profile.d/qt.sh
 
-export CFLAGS="$RPM_OPT_FLAGS"
-export CXXFLAGS="$RPM_OPT_FLAGS"
-
-# workaround for ia64, need to be fixed later
-%ifarch ia64
-export CFLAGS="$RPM_OPT_FLAGS -O0"
-export CXXFLAGS="$RPM_OPT_FLAGS -O0"
-%endif
-
-%ifarch %{support_arch}
-export CFLAGS="$CFLAGS `mozilla-config --cflags`"
-export CXXFLAGS="$CXXFLAGS `mozilla-config --cflags`"
-export CPPFLAGS="$CPPFLAGS `mozilla-config --cflags`"
-export LDFLAGS="$LDFLAGS `mozilla-config --libs`"
-%endif
-
 make -f admin/Makefile.common cvs
 
 suffix=""
@@ -225,41 +138,40 @@
    --disable-debug \
    --disable-warnings \
 %endif
-%ifarch %{support_arch}
-   --with-java=%{prefix}
-%else
    --without-java
 %endif
 
-make #%{?_smp_mflags}
+make %{?_smp_mflags}
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
-make install DESTDIR=$RPM_BUILD_ROOT
+make install DESTDIR=%{buildroot}
 
-if [ -d "$RPM_BUILD_ROOT%{_prefix}/doc" ]; then
-   mkdir -p $RPM_BUILD_ROOT%{_docdir}
-   mv -f $RPM_BUILD_ROOT%{_prefix}/doc/* $RPM_BUILD_ROOT%{_docdir}
-   rm -rf $RPM_BUILD_ROOT%{_prefix}/doc
-fi
-
-find $RPM_BUILD_ROOT -size 0 | xargs rm -f
+find %{buildroot} -size 0 | xargs rm -f
 
 desktop-file-install \
    --vendor "" \
-   --dir $RPM_BUILD_ROOT%{appdir} \
+   --dir %{buildroot}%{appdir} \
    --delete-original \
    --add-only-show-in KDE \
-   $RPM_BUILD_ROOT%{appdir}/kjscmd.desktop \
-   $RPM_BUILD_ROOT%{appdir}/embedjs.desktop
+   %{buildroot}%{appdir}/kjscmd.desktop \
+   %{buildroot}%{appdir}/embedjs.desktop
 
 %clean
-rm -rf $RPM_BUILD_ROOT
-
-%post -p /sbin/ldconfig
+rm -rf %{buildroot}
 
-%postun -p /sbin/ldconfig
+%post
+/sbin/ldconfig
+touch --no-create %{_datadir}/icons/hicolor ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
+
+%postun
+/sbin/ldconfig
+touch --no-create %{_datadir}/icons/hicolor ||:
+gtk-update-icon-cache -q %{_datadir}/icons/hicolor 2> /dev/null ||:
+update-desktop-database %{_datadir}/applications > /dev/null 2>&1 || :
 
 %files
 %defattr(-,root,root)
@@ -281,10 +193,6 @@
 %{_libdir}/python*
 %endif
 %{_libdir}/perl5
-%ifarch %{support_arch}
-%{_libdir}/java
-%doc %{_docdir}/javalib
-%endif
 
 %files devel
 %defattr(-,root,root)
@@ -293,6 +201,9 @@
 %{_mandir}/man*/*
 
 %changelog
+* Sat Jun 10 2006 Than Ngo <than at redhat.com> 3.5.3-0.1.fc5
+- update to 3.5.3
+
 * Wed Apr 05 2006 Than Ngo <than at redhat.com> 3.5.2-0.1.fc5
 - update to 3.5.2
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdebindings/FC-5/sources,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- sources	5 Apr 2006 15:37:41 -0000	1.30
+++ sources	10 Jun 2006 14:43:08 -0000	1.31
@@ -1 +1 @@
-cb26ce2e4efc35ca2c9c7a47807d679a  kdebindings-3.5.2.tar.bz2
+5595b2de6593d1d535ba520abeab4580  kdebindings-3.5.3.tar.bz2




More information about the fedora-cvs-commits mailing list