rdieter pushed to kalgebra (master). "15.03.97"

Thu Apr 9 19:11:36 UTC 2015

>From 09c215ec6ffba4f174b294c7a52dd0b583ae0cab Mon Sep 17 00:00:00 2001
From: Rex Dieter <rdieter at math.unl.edu>
Date: Thu, 9 Apr 2015 14:11:22 -0500
Subject: 15.03.97

diff --git a/.gitignore b/.gitignore
index 000e69b..b0e5969 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@
 /kalgebra-4.14.1.tar.xz
 /kalgebra-4.14.2.tar.xz
 /kalgebra-4.14.3.tar.xz
+/kalgebra-15.03.97.tar.xz
diff --git a/kalgebra-15.03.97-opengl_optional.patch b/kalgebra-15.03.97-opengl_optional.patch
new file mode 100644
index 0000000..28ef3eb
--- /dev/null
+++ b/kalgebra-15.03.97-opengl_optional.patch
@@ -0,0 +1,14 @@
+diff -up kalgebra-15.03.97/CMakeLists.txt.opengl kalgebra-15.03.97/CMakeLists.txt
+--- kalgebra-15.03.97/CMakeLists.txt.opengl	2015-03-15 06:31:58.000000000 -0500
++++ kalgebra-15.03.97/CMakeLists.txt	2015-04-09 13:38:57.352339792 -0500
+@@ -18,7 +18,10 @@ set(MOBILE_BACKEND "kde" CACHE STRING "B
+ include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR})
+ 
+ find_package(OpenGL)
++option(SHOULD_BUILD_OPENGL "Build OpenGL support" ON)
++if(SHOULD_BUILD_OPENGL)
+ set(HAVE_OPENGL ${OPENGL_FOUND})
++endif(SHOULD_BUILD_OPENGL)
+ set_package_properties(OpenGL PROPERTIES TYPE OPTIONAL
+                                          PURPOSE "Support for 3D graphs in KAlgebra"
+                                          URL "http://opengl.org")
diff --git a/kalgebra-4.12.90-opengl_optional.patch b/kalgebra-4.12.90-opengl_optional.patch
deleted file mode 100644
index 3bdd0af..0000000
--- a/kalgebra-4.12.90-opengl_optional.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -up kalgebra-4.12.90/CMakeLists.txt.opengl_optional kalgebra-4.12.90/CMakeLists.txt
---- kalgebra-4.12.90/CMakeLists.txt.opengl_optional	2014-03-10 19:37:22.000000000 -0500
-+++ kalgebra-4.12.90/CMakeLists.txt	2014-03-20 07:56:21.827947565 -0500
-@@ -11,8 +11,11 @@ find_package(Qt4 COMPONENTS QtWebKit REQ
- include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES} ${LIBKDEEDU_INCLUDE_DIR}/qtmml ${ANALITZA_INCLUDE_DIR})
- 
- macro_optional_find_package(OpenGL)
--macro_bool_to_01(OPENGL_FOUND HAVE_OPENGL)
--macro_log_feature(OPENGL_FOUND "OpenGL" "Support for 3D graphs in KAlgebra" "http://mesa3d.sourceforge.net" FALSE "" "")
-+option(SHOULD_BUILD_OPENGL "Build OpenGL support" ON)
-+if(SHOULD_BUILD_OPENGL)
-+  macro_bool_to_01(OPENGL_FOUND HAVE_OPENGL)
-+endif(SHOULD_BUILD_OPENGL)
-+macro_log_feature(HAVE_OPENGL "OpenGL" "Support for 3D graphs in Kalgebra" "http://mesa3d.sourceforge.net" FALSE "" "")
- 
- CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/config-kalgebra.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/src/config-kalgebra.h)
- 
diff --git a/kalgebra.spec b/kalgebra.spec
index dc5abe0..9b6a201 100644
--- a/kalgebra.spec
+++ b/kalgebra.spec
@@ -5,8 +5,8 @@
 
 Name:    kalgebra 
 Summary: 2D and 3D Graph Calculator 
-Version: 4.14.3
-Release: 3%{?dist}
+Version: 15.03.97
+Release: 1%{?dist}
 
 License: GPLv2+
 URL:     https://projects.kde.org/projects/kde/kdeedu/%{name}
@@ -20,21 +20,22 @@ Source0: http://download.kde.org/%{stable}/%{version}/src/%{name}-%{version}.tar
 
 # add SHOULD_BUILD_OPENGL option, to be able to disable support
 # on arm because plotter3d assumes qreal=double all over the place
-Patch1: kalgebra-4.12.90-opengl_optional.patch
+Patch1: kalgebra-15.03.97-opengl_optional.patch
 
 ## upstream patches
 
-BuildRequires: analitza-devel >= 4.14
+BuildRequires: analitza-devel >= 14.12
 BuildRequires: desktop-file-utils
-BuildRequires: kdelibs4-devel >= 4.14
+BuildRequires: extra-cmake-modules >= 1.3
+BuildRequires: kf5-rpm-macros
 %if 0%{?fedora} > 19
 BuildRequires: libappstream-glib
 %endif
-BuildRequires: libkdeedu-devel >= 4.14
-BuildRequires: libkdeedu-static
-BuildRequires: pkgconfig(QtWebKit)
-
-%{?kde_runtime_requires}
+BuildRequires: pkgconfig(Qt5Qml) pkgconfig(Qt5Quick) pkgconfig(Qt5Xml)
+BuildRequires: pkgconfig(Qt5Svg) pkgconfig(Qt5OpenGL) pkgconfig(Qt5PrintSupport) pkgconfig(Qt5Test)
+# mobile
+BuildRequires: pkgconfig(Qt5WebKit)
+BuildRequires: kf5-ki18n-devel kf5-kconfigwidgets-devel kf5-kwidgetsaddons-devel kf5-kio-devel kf5-kdoctools-devel
 
 %description
 %{summary}.
@@ -49,7 +50,7 @@ BuildRequires: pkgconfig(QtWebKit)
 %build
 mkdir %{_target_platform}
 pushd %{_target_platform}
-%{cmake_kde4} \
+%{cmake_kf5} \
   %{!?opengl:-DSHOULD_BUILD_OPENGL:BOOL=OFF} \
   ..
 popd
@@ -74,48 +75,47 @@ cat > $RPM_BUILD_ROOT%{_datadir}/appdata/kalgebramobile.appdata.xml <<EOF
 </component>
 EOF
 
-%find_lang %{name} --with-kde --without-mo
-
 
 %check
-appstream-util validate-relax --nonet %{buildroot}%{_kde4_datadir}/appdata/%{name}.appdata.xml ||:
-desktop-file-validate %{buildroot}%{_kde4_datadir}/applications/kde4/%{name}.desktop
+appstream-util validate-relax --nonet %{buildroot}%{_datadir}/appdata/%{name}.appdata.xml ||:
+desktop-file-validate %{buildroot}%{_datadir}/applications/kalgebramobile.desktop ||:
+desktop-file-validate %{buildroot}%{_datadir}/applications/org.kde.kalgebra.desktop ||:
 
 
 %post
-touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
+touch --no-create %{_datadir}/icons/hicolor &> /dev/null || :
 
 %posttrans
-gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+gtk-update-icon-cache  %{_datadir}/icons/hicolor  &> /dev/null || :
 
 %postun
 if [ $1 -eq 0 ] ; then
-touch --no-create %{_kde4_iconsdir}/hicolor &> /dev/null || :
-gtk-update-icon-cache %{_kde4_iconsdir}/hicolor &> /dev/null || :
+touch --no-create  %{_datadir}/icons/hicolor  &> /dev/null || :
+gtk-update-icon-cache  %{_datadir}/icons/hicolor  &> /dev/null || :
 fi
 
-%files -f %{name}.lang
-%doc COPYING TODO
-%{_kde4_bindir}/kalgebra
-%{_kde4_bindir}/kalgebramobile
-%{_kde4_libdir}/kde4/plasma_applet_kalgebra.so
-%{_kde4_datadir}/appdata/kalgebra.appdata.xml
-%{_kde4_datadir}/appdata/kalgebramobile.appdata.xml
-%{_kde4_datadir}/applications/kde4/kalgebra.desktop
-%{_kde4_datadir}/applications/kde4/kalgebramobile.desktop
-%{_kde4_iconsdir}/hicolor/*/*/kalgebra.*
-%{_kde4_appsdir}/kalgebramobile
-# own dirs, avoid hard dep on kate-part
-%dir %{_kde4_appsdir}/katepart
-%dir %{_kde4_appsdir}/katepart/syntax
-%{_kde4_appsdir}/katepart/syntax/kalgebra.xml
-%{_kde4_datadir}/kde4/services/kalgebra*.desktop
-%{_kde4_libdir}/kde4/imports/org/kde/analitza/
-%{_kde4_appsdir}/plasma/plasmoids/org.kde.graphsplasmoid/
-%{_kde4_datadir}/kde4/services/graphsplasmoid.desktop
+%files
+%doc TODO
+%license COPYING
+%{_kf5_docdir}/HTML/en/kalgebra/
+%{_kf5_bindir}/calgebra
+%{_kf5_bindir}/kalgebra
+%{_kf5_bindir}/kalgebramobile
+%{_datadir}/appdata/kalgebra.appdata.xml
+%{_datadir}/appdata/kalgebramobile.appdata.xml
+%{_datadir}/icons/hicolor/*/*/kalgebra.*
+%{_kf5_datadir}/kalgebramobile/
+%{_kf5_datadir}/applications/kalgebramobile.desktop
+%{_kf5_datadir}/applications/org.kde.kalgebra.desktop
+%{_kf5_datadir}/katepart5/syntax/kalgebra.xml
+%{_kf5_datadir}/kservices5/graphsplasmoid.desktop
+%{_kf5_datadir}/plasma/plasmoids/org.kde.graphsplasmoid/
 
 
 %changelog
+* Thu Apr 09 2015 Rex Dieter <rdieter at fedoraproject.org>  15.03.97-1
+- 15.03.97
+
 * Thu Mar 26 2015 Richard Hughes <rhughes at redhat.com> - 4.14.3-3
 - Add an AppData file for the software center
 
diff --git a/sources b/sources
index dca8e4d..14f139c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-58ff0a779af705f4f8bc41a4dc399e81  kalgebra-4.14.3.tar.xz
+767980ef33f12db762ddcea5a236509f  kalgebra-15.03.97.tar.xz
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/kalgebra.git/commit/?h=master&id=09c215ec6ffba4f174b294c7a52dd0b583ae0cab
