rpms/kdebindings/FC-4 kdebindings.spec,1.37,1.38 sources,1.27,1.28

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Tue Apr 11 14:52:44 UTC 2006


Author: than

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

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



Index: kdebindings.spec
===================================================================
RCS file: /cvs/dist/rpms/kdebindings/FC-4/kdebindings.spec,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -r1.37 -r1.38
--- kdebindings.spec	1 Feb 2006 23:29:46 -0000	1.37
+++ kdebindings.spec	11 Apr 2006 14:52:30 -0000	1.38
@@ -2,6 +2,8 @@
 %define final 0
 %define disable_gcc_check_and_hidden_visibility 1
 
+%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
@@ -10,7 +12,7 @@
 
 %define mozilla_version 1.6.0
 %define qt_version 3.3.4
-%define arts_version 1.5.1
+%define arts_version 1.5.2
 %define pythonver 2.4
 %define perlver 5.8
 %define perlepoch 3
@@ -22,7 +24,7 @@
 %define ruby 1
 %define pyqt 0
 
-Version: 3.5.1
+Version: 3.5.2
 Release: 0.1.fc4
 Name: kdebindings
 Summary: KDE bindings to non-C++ languages
@@ -46,6 +48,7 @@
 BuildRequires: libjpeg-devel
 BuildRequires: libpng-devel
 BuildRequires: automake
+BuildRequires: /usr/bin/desktop-file-install
 
 %if %{perl}
 BuildRequires: perl >= %{perlver}
@@ -177,14 +180,8 @@
 %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
+export CFLAGS="%{optflags}"
+export CXXFLAGS="%{optflags}"
 
 %ifarch %{support_arch}
 export CFLAGS="$CFLAGS `mozilla-config --cflags`"
@@ -229,20 +226,28 @@
 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
+if [ -d "%{buildroot}%{_prefix}/doc" ]; then
+   mkdir -p %{buildroot}%{_docdir}
+   mv -f %{buildroot}%{_prefix}/doc/* %{buildroot}%{_docdir}
+   rm -rf %{buildroot}%{_prefix}/doc
 fi
 
-find $RPM_BUILD_ROOT -size 0 | xargs rm -f
+find %{buildroot} -size 0 | xargs rm -f
+
+desktop-file-install \
+   --vendor "" \
+   --dir %{buildroot}%{appdir} \
+   --delete-original \
+   --add-only-show-in KDE \
+   %{buildroot}%{appdir}/kjscmd.desktop \
+   %{buildroot}%{appdir}/embedjs.desktop
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %post -p /sbin/ldconfig
 
@@ -280,6 +285,9 @@
 %{_mandir}/man*/*
 
 %changelog
+* Tue Apr 11 2006 Than Ngo <than at redhat.com> 3.5.2-0.1.fc4
+- update to 3.5.2
+
 * Thu Feb 02 2006 Than Ngo <than at redhat.com> 3.5.1-0.1.fc4
 - 3.5.1
 


Index: sources
===================================================================
RCS file: /cvs/dist/rpms/kdebindings/FC-4/sources,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- sources	1 Feb 2006 23:29:46 -0000	1.27
+++ sources	11 Apr 2006 14:52:31 -0000	1.28
@@ -1 +1 @@
-302f6a842b5a29701846c49a24a64039  kdebindings-3.5.1.tar.bz2
+cb26ce2e4efc35ca2c9c7a47807d679a  kdebindings-3.5.2.tar.bz2




More information about the fedora-cvs-commits mailing list