Hello community, here is the log from the commit of package cantor for openSUSE:Factory checked in at 2012-03-26 14:00:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/cantor (Old) and /work/SRC/openSUSE:Factory/.cantor.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cantor", Maintainer is "" Changes: -------- --- /work/SRC/openSUSE:Factory/cantor/cantor.changes 2012-03-12 20:11:55.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.cantor.new/cantor.changes 2012-03-26 14:00:46.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Mar 22 19:58:32 UTC 2012 - [email protected] + +- fix bnc#753292 +- add documentation +- separate shared libraries + +------------------------------------------------------------------- New: ---- cantor-bko296546.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cantor.spec ++++++ --- /var/tmp/diff_new_pack.tPwL5n/_old 2012-03-26 14:00:48.000000000 +0200 +++ /var/tmp/diff_new_pack.tPwL5n/_new 2012-03-26 14:00:48.000000000 +0200 @@ -15,12 +15,14 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # +%global libMAJOR 1 Name: cantor BuildRequires: R-base-devel BuildRequires: analitza-devel BuildRequires: fdupes BuildRequires: gcc-fortran +BuildRequires: help2man BuildRequires: kdebase4-workspace-devel BuildRequires: libkdeedu4-devel BuildRequires: libqalculate-devel @@ -38,7 +40,7 @@ Group: Amusements/Teaching/Mathematics Url: http://edu.kde.org Source0: %{name}-%{version}.tar.bz2 -Requires: libkeduvocdocument4 +Patch: %{name}-bko296546.patch Suggests: libkeduvocdocument4 Provides: kde4-cantor = 4.3.0 Obsoletes: kde4-cantor < 4.3.0 @@ -60,28 +62,60 @@ and Maxima: Cantor. Cantor offers a worksheet as a nice GUI for all those backends and is not targeted to kids but to scientists +%package -n libcantorlibs%{libMAJOR} +Summary: Shared libraries for Cantor +Group: System/Libraries + +%description -n libcantorlibs%{libMAJOR} +Shared libraries for package cantor + %prep %setup -q +%patch -p1 +mkdir .doc +cd src/backends +for d in * +do ! ln -T "${d}/DESIGN" "../../.doc/${d}" +done %build %ifarch ppc ppc64 export RPM_OPT_FLAGS="%{optflags} -mminimal-toc" %endif - %cmake_kde4 -d build +# bnc#753292 + %{lua: z = rpm .expand ("%cmake_kde4 -d build") + f, t = string .find (z, "-DCMAKE_SKIP_RPATH=ON", 0, true) + print (string .sub (z, 0, f - 01), "-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=ON", string .sub (z, t + 01)) } %make_jobs + # generate manual pages for cantor + ! mkdir man1 + for a in cantor + do m="man1/${a}.1" + help2man>"${m}" "src/${a}.shell" + gzip "${m}" + done + for a in cantor_rserver + do m="man1/${a}.1" + R>"${m}" CMD help2man "src/backends/R/rserver/${a}.shell" + gzip "${m}" + done %install cd build - %make_install + %make_install VERBOSE=1 %suse_update_desktop_file %{name} Education Math %kde_post_install + for m in '%{buildroot}%{_mandir}/man1' + do install -d "${m}" + install "-t${m}" -ma=r man1/* + done %fdupes -s %{buildroot} %clean rm -rf %{buildroot} -%post -p /sbin/ldconfig -%postun -p /sbin/ldconfig +%post -n libcantorlibs%{libMAJOR} -p /sbin/ldconfig +%postun -n libcantorlibs%{libMAJOR} -p /sbin/ldconfig %post devel -p /sbin/ldconfig %postun devel -p /sbin/ldconfig @@ -90,6 +124,7 @@ %defattr(-,root,root) %{_kde4_libdir}/libcantorlibs.so %{_includedir}/cantor/ +%doc COPYING %files %defattr(-,root,root) @@ -97,15 +132,21 @@ %{_kde4_applicationsdir}/cantor.desktop %{_kde4_bindir}/cantor %{_kde4_bindir}/cantor_rserver -%config %{_kde4_configkcfgdir}/*.kcfg -%config %{_kde4_configdir}/cantor*.knsrc +%{_kde4_configkcfgdir}/*.kcfg +%{_kde4_configdir}/cantor*.knsrc %doc %{_kde4_htmldir}/en/cantor/ +%doc %{_mandir}/man1/* +%doc COPYING COPYING.DOC README TODO DESIGN .doc/* %{_kde4_iconsdir}/hicolor/*/apps/* %{_kde4_libdir}/libcantor_config.so +%{_kde4_servicesdir}/cantor/ +%{_kde4_servicetypesdir}/cantor* + +%files -n libcantorlibs%{libMAJOR} +%defattr(-,root,root) %{_kde4_libdir}/libcantorlibs.so.* %{_kde4_modulesdir}/cantor*so %{_kde4_modulesdir}/libcantor*so -%{_kde4_servicesdir}/cantor/ -%{_kde4_servicetypesdir}/cantor* +%doc COPYING %changelog ++++++ cantor-bko296546.patch ++++++ --- o/src/backends/R/rsession.cpp 2011-07-27 20:37:50.000000000 +0200 +++ n/src/backends/R/rsession.cpp 2012-03-22 19:23:24.263315250 +0100 @@ -50,7 +50,7 @@ m_rProcess=new KProcess(this); m_rProcess->setOutputChannelMode(KProcess::ForwardedChannels); - (*m_rProcess)<<KStandardDirs::findExe( "cantor_rserver" ); + (*m_rProcess) << KStandardDirs::findExe( "R" ) << "CMD" << KStandardDirs::findExe( "cantor_rserver" ); m_rProcess->start(); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
