rpms/okteta/devel okteta-0.1-beta2-cmakelists.patch, NONE, 1.1 .cvsignore, 1.6, 1.7 okteta.spec, 1.8, 1.9 sources, 1.6, 1.7 okteta-0.0.9-kde40.patch, 1.1, NONE okteta-0.1.0-doc-subdir.patch, 1.1, NONE

Mon Mar 31 10:34:23 UTC 2008

Author: kkofler

Update of /cvs/pkgs/rpms/okteta/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv26776/devel

Modified Files:
	.cvsignore okteta.spec sources 
Added Files:
	okteta-0.1-beta2-cmakelists.patch 
Removed Files:
	okteta-0.0.9-kde40.patch okteta-0.1.0-doc-subdir.patch 
Log Message:
* Mon Mar 31 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.1.0-0.2.beta2
- Update to beta 2
- Use official tarball + separate translations
- Package COPYING
- Drop part of kde40.patch no longer needed with kdelibs 4.0.3

okteta-0.1-beta2-cmakelists.patch:

--- NEW FILE okteta-0.1-beta2-cmakelists.patch ---
diff -ur okteta-0.1-beta2/CMakeLists.txt okteta-0.1-beta2-cmakelists/CMakeLists.txt
--- okteta-0.1-beta2/CMakeLists.txt	2008-03-31 00:52:39.000000000 +0200
+++ okteta-0.1-beta2-cmakelists/CMakeLists.txt	2008-03-31 12:23:44.000000000 +0200
@@ -5,47 +5,6 @@
 include (KDE4Defaults)
 include (MacroLibrary)
 include(MacroOptionalAddSubdirectory)
-include(MacroOptionalDependPackage)
 
-# local cmake modules
-set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake/modules)
-
-MACRO_OPTIONAL_DEPEND_PACKAGE(LibKDEGames "kdegames")
-if(DEPEND_PACKAGE_LibKDEGames)
-	macro_optional_find_package(LibKDEGames QUIET)
-else(DEPEND_PACKAGE_LibKDEGames)
-	set(KDEGAMES_FOUND FALSE)
-endif(DEPEND_PACKAGE_LibKDEGames)
-
-add_definitions (${QT_DEFINITIONS} ${KDE4_DEFINITIONS})
-include_directories (${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${KDE4_INCLUDES})
-
-macro_optional_add_subdirectory(phonon)
-
-macro_optional_find_package( Plasma )
-macro_log_feature(PLASMA_FOUND "plasma" "Plasma libraries and header files" "http://plasma.kde.org/" FALSE "" "Needed for Plasma components")
-
-if (PLASMA_FOUND)
-  macro_optional_add_subdirectory(plasma)
-endif (PLASMA_FOUND)
-
-if ( Q_WS_X11 )
-   macro_optional_add_subdirectory(autostart)
-endif ( Q_WS_X11 )
-
-if (KDEGAMES_FOUND)
-   macro_optional_add_subdirectory(kubrick)
-endif (KDEGAMES_FOUND)
-
-macro_optional_add_subdirectory(step)
 macro_optional_add_subdirectory(doc)
-macro_optional_add_subdirectory(printer-applet)
 macro_optional_add_subdirectory(okteta)
-
-macro_optional_find_package( KSane )
-if (KSANE_FOUND)
-    macro_optional_add_subdirectory(glimpse)
-endif (KSANE_FOUND)
-
-
-macro_display_feature_log()
diff -ur okteta-0.1-beta2/doc/CMakeLists.txt okteta-0.1-beta2-cmakelists/doc/CMakeLists.txt
--- okteta-0.1-beta2/doc/CMakeLists.txt	2008-03-31 00:52:39.000000000 +0200
+++ okteta-0.1-beta2-cmakelists/doc/CMakeLists.txt	2008-03-31 12:25:59.000000000 +0200
@@ -1,5 +1 @@
-add_subdirectory(step)
-add_subdirectory(kubrick)
-add_subdirectory(autostart)
-add_subdirectory(glimpse)
 add_subdirectory(okteta)


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/okteta/devel/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	28 Mar 2008 10:57:10 -0000	1.6
+++ .cvsignore	31 Mar 2008 10:33:43 -0000	1.7
@@ -1 +1,2 @@
-okteta-0.1.0-791022.tar.bz2
+77819-okteta-0.1-beta2.tar.bz2
+okteta-translations-0.1.0-beta2.tar.bz2


Index: okteta.spec
===================================================================
RCS file: /cvs/pkgs/rpms/okteta/devel/okteta.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- okteta.spec	28 Mar 2008 10:57:10 -0000	1.8
+++ okteta.spec	31 Mar 2008 10:33:43 -0000	1.9
@@ -1,20 +1,20 @@
-%define revision 791022
-
 Summary: Binary editor
 Name:    okteta
 Version: 0.1.0
-Release: 0.1.20080328svn%{revision}%{?dist}
+Release: 0.2.beta2%{?dist}
 
 Group:   Applications/Editors
 # GPLv2 or GPLv3 or later as approved by KDE e.V.
 License: GPLv2 or GPLv3
 URL:     http://frinring.wordpress.com/category/okteta/
-# checked out from svn://anonsvn.kde.org/home/kde/trunk/playground/utils/okteta
-Source0: %{name}-%{version}-%{revision}.tar.bz2
+# from http://www.kde-apps.org/content/show.php/Okteta?content=77819
+Source0: 77819-okteta-0.1-beta2.tar.bz2
+# translations collected from http://websvn.kde.org/trunk/l10n-kde4/*/messages/playground-utils
+Source1: okteta-translations-0.1.0-beta2.tar.bz2
 # fix build with kdelibs 4.0.x
-Patch0:  okteta-0.0.9-kde40.patch
-# fix the documentation directory
-Patch1:  okteta-0.1.0-doc-subdir.patch
+Patch0:  okteta-0.1-beta2-kde40.patch
+# cleanup toplevel and doc CMakeLists.txt to remove unwanted portions causing errors
+Patch1:  okteta-0.1-beta2-cmakelists.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: cmake
@@ -27,9 +27,16 @@
 either hex or ASCII. Okteta uses the KDE 4 libraries.
 
 %prep
-%setup -q -n %{name}-%{version}-%{revision}
+%setup -q -n okteta-0.1-beta2 -a 1
+cd okteta
 %patch0 -p1
+cd ..
 %patch1 -p1
+# add translations to sources
+cat okteta-translations-0.1.0-beta2/CMakeLists.txt >>okteta/CMakeLists.txt
+rm -f okteta-translations-0.1.0-beta2/CMakeLists.txt
+mv -f okteta-translations-0.1.0-beta2/po okteta/po
+rmdir okteta-translations-0.1.0-beta2
 
 %build
 %cmake_kde4 .
@@ -54,7 +61,7 @@
 
 %files -f %{name}.lang
 %defattr(-,root,root,-)
-# Hey upstream, where's COPYING?
+%doc COPYING
 %{_kde4_bindir}/okteta
 %{_kde4_libdir}/liboktetacore_b.so.4
 %{_kde4_libdir}/liboktetacore_b.so.4.0.0
@@ -73,6 +80,12 @@
 %doc %{_kde4_docdir}/HTML/en/okteta/
 
 %changelog
+* Mon Mar 31 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.1.0-0.2.beta2
+- Update to beta 2
+- Use official tarball + separate translations
+- Package COPYING
+- Drop part of kde40.patch no longer needed with kdelibs 4.0.3
+
 * Fri Mar 28 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.1.0-0.1.20080328svn791022
 - Update to revision 791022 (beta 1 + minor bugfixes)
 - Package documentation (added upstream)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/okteta/devel/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	28 Mar 2008 10:57:10 -0000	1.6
+++ sources	31 Mar 2008 10:33:43 -0000	1.7
@@ -1 +1,2 @@
-4fdc2814937b74eafe47eebee67c31fb  okteta-0.1.0-791022.tar.bz2
+a6721a5f062e75632343b4bede8927b0  77819-okteta-0.1-beta2.tar.bz2
+ab58ed740754667202e33d2d9d576698  okteta-translations-0.1.0-beta2.tar.bz2


--- okteta-0.0.9-kde40.patch DELETED ---


--- okteta-0.1.0-doc-subdir.patch DELETED ---


