Hello community,

here is the log from the commit of package libkdeedu4 for openSUSE:Factory
checked in at Fri Sep 9 12:10:04 CEST 2011.



--------
--- libkdeedu4/libkdeedu4.changes       2011-07-22 20:27:47.000000000 +0200
+++ /mounts/work_src_done/STABLE/libkdeedu4/libkdeedu4.changes  2011-09-07 
14:49:57.000000000 +0200
@@ -1,0 +2,16 @@
+Thu Sep  1 23:27:52 CEST 2011 - [email protected]
+
+- update to 4.7.1
+  * Bugfixes over KDE 4.7.0
+  *  see http://kde.org/announcements/changelogs/changelog4_7_0to4_7_1.php for 
details
+
+-------------------------------------------------------------------
+Fri Aug 26 15:00:27 UTC 2011 - [email protected]
+
+- Changed libkdeed4 package to libkdeedu4-data noarch package,
+  since it only has icons and data files (fix for RPMLINT warning)
+- Removed tests for obsolete openSUSE versions (fix for RPMLINT warning)
+- Removed obsolete patch
+- Cleaned up spec file formatting
+
+-------------------------------------------------------------------

calling whatdependson for head-i586


Old:
----
  4_6_BRANCH.diff
  libkdeedu-4.7.0.tar.bz2

New:
----
  libkdeedu-4.7.1.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ libkdeedu4.spec ++++++
--- /var/tmp/diff_new_pack.kR5rea/_old  2011-09-09 12:09:57.000000000 +0200
+++ /var/tmp/diff_new_pack.kR5rea/_new  2011-09-09 12:09:57.000000000 +0200
@@ -18,87 +18,81 @@
 
 
 Name:           libkdeedu4
-BuildRequires:  boost-devel freeglut-devel kdebase4-workspace-devel
-BuildRequires:  gsl-devel libeigen2-devel libspectre-devel python-qt4-devel
-BuildRequires:  libgmm++-devel readline-devel
-BuildRequires:  libcfitsio-devel libindi-devel libqalculate-devel
+BuildRequires:  boost-devel
+BuildRequires:  fdupes
+BuildRequires:  freeglut-devel
+BuildRequires:  gsl-devel
+BuildRequires:  kdebase4-workspace-devel
+BuildRequires:  libcfitsio-devel
+BuildRequires:  libeigen2-devel
+BuildRequires:  libgmm++-devel
+BuildRequires:  libindi-devel
 BuildRequires:  libopenbabel-devel
+BuildRequires:  libqalculate-devel
+BuildRequires:  libspectre-devel
+BuildRequires:  python-qt4-devel
+BuildRequires:  readline-devel
 %if 0%{?sles_version} == 0
-BuildRequires:  glew-devel python python-devel
-%if 0%{?suse_version} > 1120
 BuildRequires:  avogadro-devel
-%endif
+BuildRequires:  glew-devel
+BuildRequires:  python-devel
 %py_requires 
 %endif
-
 %ifnarch ppc ppc64 s390 s390x
-BuildRequires:  ocaml ocaml-facile
-%endif
-%if 0
+BuildRequires:  ocaml
+BuildRequires:  ocaml-facile
 %endif
-BuildRequires:  fdupes
+Version:        4.7.1
+Release:        1
 License:        GPLv2+
-Group:          System/GUI/KDE
 Summary:        Library for KDE Education Applications
 Url:            http://edu.kde.org
-Version:        4.7.0
-Release:        1
-Source0:        libkdeedu-%version.tar.bz2
-Patch0:         4_6_BRANCH.diff
+Group:          System/GUI/KDE
+Source0:        libkdeedu-%{version}.tar.bz2
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%kde4_runtime_requires
-Requires:       libkeduvocdocument4 = %{version}
 
 %description
 This package contains the library which is required by the KDE education
 applications.
 
-
-
-Authors:
---------
-    The KDE Team <[email protected]>
-
 %prep
-%setup -q -n libkdeedu-%version
-%patch0 -p0
+%setup -q -n libkdeedu-%{version}
 
 %build
 %ifarch ppc ppc64
-export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -mminimal-toc"
+export RPM_OPT_FLAGS="%{optflags} -mminimal-toc"
 %endif
   %cmake_kde4 -d build
   %make_jobs
 
 %install
   cd build
-  %makeinstall
+  %make_install
   cd ..
   %kde_post_install
-  %fdupes -s $RPM_BUILD_ROOT
+  %fdupes -s %{buildroot}
 
 %post -p /sbin/ldconfig
 
 %postun -p /sbin/ldconfig
 
 %clean
-  rm -rf $RPM_BUILD_ROOT
+  rm -rf %{buildroot}
 
 %package -n libkeduvocdocument4
 License:        GPLv2+
-Group:          System/GUI/KDE
 Summary:        Library for KDE Education Applications
-Requires:       libkdeedu4 = %{version}
+Group:          System/GUI/KDE
+Requires:       %{name}-data = %{version}
+Obsoletes:      %{name} < %{version}
+Obsoletes:      kdeedu4 <= 4.6.80
+Provides:       %{name} = %{version}
+Provides:       kdeedu4 = %{version}
 %kde4_runtime_requires
 
 %description -n libkeduvocdocument4
-This package contains the KDE education library.
-
-
-
-Authors:
---------
-    The KDE Team <[email protected]>
+This package contains the library which is required by the KDE education
+applications.
 
 %post -n libkeduvocdocument4 -p /sbin/ldconfig
 
@@ -107,38 +101,45 @@
 %files -n libkeduvocdocument4 
 %defattr(-,root,root)
 %doc README
-%_kde4_libdir/libkeduvocdocument.so.*
+%{_kde4_libdir}/libkeduvocdocument.so.*
 
 %package devel
 License:        GPLv2+
-Group:          System/GUI/KDE
 Summary:        Library for KDE Education Applications: Build Environment
-Requires:       libkeduvocdocument4 = %version
-Requires:       libkdeedu4 = %version
+Group:          Development/Libraries/KDE
 Requires:       libkde4-devel
+Requires:       libkeduvocdocument4 = %{version}
+%py_requires -d
 
 %description devel
 This package contains all necessary files and libraries needed to
 develop KDE education applications.
 
-
-
-Authors:
---------
-    The KDE Team <[email protected]>
-
 %files devel 
 %defattr(-,root,root)
 %doc README
-/usr/include/libkdeedu/
-%_kde4_libdir/cmake/libkdeedu/
-%_kde4_libdir/libkeduvocdocument.so
-%_kde4_libdir/libqtmmlwidget.a
+%{_includedir}/libkdeedu/
+%{_kde4_libdir}/cmake/libkdeedu/
+%{_kde4_libdir}/libkeduvocdocument.so
+%{_kde4_libdir}/libqtmmlwidget.a
+
+%package data
+License:        GPLv2+
+Summary:        Data files for KDE Education Applications
+Group:          System/GUI/KDE
+Requires:       libkeduvocdocument4 = %{version}
+Obsoletes:      kdeedu4-noarch <= 4.6.80
+BuildArch:      noarch
+Provides:       kdeedu4-noarch = %{version}
+
+%description data
+This package contains common data files used by various
+KDE education applications.
 
-%files 
+%files data
 %defattr(-,root,root)
 %doc README
-%_kde4_iconsdir/hicolor/*
-%_kde4_appsdir/kvtml/
+%{_kde4_iconsdir}/hicolor/*
+%{_kde4_appsdir}/kvtml/
 
 %changelog

++++++ libkdeedu-4.7.0.tar.bz2 -> libkdeedu-4.7.1.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' old/libkdeedu-4.7.0/qtmmlwidget/qtmmlwidget.cpp 
new/libkdeedu-4.7.1/qtmmlwidget/qtmmlwidget.cpp
--- old/libkdeedu-4.7.0/qtmmlwidget/qtmmlwidget.cpp     2011-06-22 
16:52:33.000000000 +0200
+++ new/libkdeedu-4.7.1/qtmmlwidget/qtmmlwidget.cpp     2011-09-01 
22:47:38.000000000 +0200
@@ -3625,7 +3625,7 @@
 
     return QString("%1 %2 mr=%3 pr=%4 dr=%5 ro=(%7, %8) str=%9")
                .arg(spec->type_str)
-               .arg((unsigned long)this, 0, 16)
+               .arg((quintptr)this, 0, 16)
                .arg(rectToStr(myRect()))
                .arg(rectToStr(parentRect()))
                .arg(rectToStr(deviceRect()))


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

-- 
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to