rpms/kdeedu/devel .cvsignore, 1.29, 1.30 kdeedu.spec, 1.56, 1.57 sources, 1.32, 1.33
Rex Dieter (rdieter)
fedora-extras-commits at redhat.com
Sat Jun 16 23:27:57 UTC 2007
Author: rdieter
Update of /cvs/pkgs/rpms/kdeedu/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1599
Modified Files:
.cvsignore kdeedu.spec sources
Log Message:
* Mon Jun 11 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 3.5.7-1
- 3.5.7
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/devel/.cvsignore,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- .cvsignore 10 Aug 2006 12:36:15 -0000 1.29
+++ .cvsignore 16 Jun 2007 23:27:22 -0000 1.30
@@ -1,15 +1 @@
-kdeedu-3.3.0.tar.bz2
-kdeaddons-3.3.1.tar.bz2
-kdeedu-3.3.1.tar.bz2
-kdeedu-3.3.2.tar.bz2
-kdeedu-3.4.0-rc1.tar.bz2
-kdeedu-3.4.0.tar.bz2
-kdeedu-3.4.1.tar.bz2
-kdeedu-3.4.2.tar.bz2
-kdeedu-3.4.91.tar.bz2
-kdeedu-3.4.92.tar.bz2
-kdeedu-3.5.0.tar.bz2
-kdeedu-3.5.1.tar.bz2
-kdeedu-3.5.2.tar.bz2
-kdeedu-3.5.3.tar.bz2
-kdeedu-3.5.4.tar.bz2
+kdeedu-3.5.7.tar.bz2
Index: kdeedu.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/devel/kdeedu.spec,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- kdeedu.spec 6 Mar 2007 14:34:40 -0000 1.56
+++ kdeedu.spec 16 Jun 2007 23:27:22 -0000 1.57
@@ -1,18 +1,18 @@
-%define rhel 0
%define debug 0
%define final 0
-%define make_cvs 1
+%define make_cvs 0
%define kdelibs_epoch 6
-Name: kdeedu
-Version: 3.5.6
-Release: 2%{?dist}
+Name: kdeedu
Summary: Educational/Edutainment applications
-Group: Amusements/Games
-URL: http://www.kde.org/
+Version: 3.5.7
+Release: 1%{?dist}
+
License: GPL
+Group: Amusements/Games
+URL: http://www.kde.org/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
Source0: ftp://ftp.kde.org/pub/kde/stable/%{version}/src/%{name}-%{version}.tar.bz2
@@ -25,9 +25,7 @@
BuildRequires: python-devel python
BuildRequires: boost-devel
%if %{make_cvs}
-BuildRequires: autoconf
-BuildRequires: automake
-BuildRequires: libtool
+BuildRequires: automake libtool
%endif
%description
@@ -60,27 +58,28 @@
%description devel
This package contains header files for kdeedu.
+
%prep
%setup -q
-%if %{rhel}
+%if 0%{?rhel} > 1
rm -rf doc/kgeography kgeography
perl -pi -e "s|kgeography||" subdirs
%endif
-%build
-unset QTDIR || : ; . /etc/profile.d/qt.sh
-
%if %{make_cvs}
make -f admin/Makefile.common cvs
%endif
+
+%build
+unset QTDIR || : ; . /etc/profile.d/qt.sh
+
%configure \
--enable-new-ldflags \
--disable-dependency-tracking \
--disable-rpath \
--enable-kig-python-scripting \
- --disable-gcc-hidden-visibility \
%if %{debug} == 0
--disable-debug \
--disable-warnings \
@@ -92,6 +91,7 @@
make %{?_smp_mflags}
+
%install
rm -rf %{buildroot}
@@ -136,19 +136,23 @@
%clean
rm -rf %{buildroot}
+
%post
/sbin/ldconfig ||:
-%{_bindir}/xdg-icon-resource forceupdate --theme crystalsvg 2> /dev/null || :
-%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-%{_bindir}/xdg-icon-resource forceupdate --theme locolor 2> /dev/null || :
-%{_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || :
+for i in crystalsvg hicolor locolor ; do
+ touch --no-create %{_datadir}/icons/$i 2>/dev/null || :
+ %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/$i 2>/dev/null || :
+done
+%{_bindir}/update-desktop-database >& /dev/null ||:
%postun
/sbin/ldconfig ||:
-%{_bindir}/xdg-icon-resource forceupdate --theme crystalsvg 2> /dev/null || :
-%{_bindir}/xdg-icon-resource forceupdate --theme hicolor 2> /dev/null || :
-%{_bindir}/xdg-icon-resource forceupdate --theme locolor 2> /dev/null || :
-%{_bindir}/xdg-desktop-menu forceupdate 2> /dev/null || :
+for i in crystalsvg hicolor locolor ; do
+ touch --no-create %{_datadir}/icons/$i 2>/dev/null || :
+ %{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/$i 2>/dev/null || :
+done
+%{_bindir}/update-desktop-database >& /dev/null ||:
+
%files -f %{name}.lang
%defattr(-,root,root,-)
@@ -156,6 +160,7 @@
%doc rpmdocs/*
%{_bindir}/*
%{_datadir}/applications/kde/*
+# FIXME
%{_datadir}/applnk/Edutainment/
%{_datadir}/apps/*
%config %{_datadir}/config*/*
@@ -174,7 +179,11 @@
%{_includedir}/kde/*
%{_libdir}/*.so
+
%changelog
+* Mon Jun 11 2007 Rex Dieter <rdieter[AT]fedoraproject.org> - 3.5.7-1
+- 3.5.7
+
* Tue Mar 06 2007 Than Ngo <than at redhat.com> - 3.5.6-2.fc7
- cleanup
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kdeedu/devel/sources,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- sources 7 Feb 2007 22:54:49 -0000 1.32
+++ sources 16 Jun 2007 23:27:22 -0000 1.33
@@ -1 +1 @@
-6017317b133d973e7fc8a279a81f37a1 kdeedu-3.5.6.tar.bz2
+e2568148df3bf5aecec2ed21c4a0e0a1 kdeedu-3.5.7.tar.bz2
More information about the fedora-extras-commits
mailing list