rpms/okteta/devel .cvsignore, 1.2, 1.3 okteta.spec, 1.1, 1.2 sources, 1.2, 1.3 okteta-0.0.1-755662-cmakelists-no-kparts.patch, 1.1, NONE

[Kevin Kofler (kkofler)]

Author: kkofler

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

Modified Files:
	.cvsignore okteta.spec sources 
Removed Files:
	okteta-0.0.1-755662-cmakelists-no-kparts.patch 
Log Message:
* Mon Feb 4 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.0.1-0.3.20080203svn770494
- Update to revision 770494
- Package translations
- Drop unneeded package_kpart conditional


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/okteta/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	16 Jan 2008 22:01:54 -0000	1.2
+++ .cvsignore	4 Feb 2008 03:41:26 -0000	1.3
@@ -1 +1 @@
-okteta-0.0.1-761510.tar.bz2
+okteta-0.0.1-770494.tar.bz2


Index: okteta.spec
===================================================================
RCS file: /cvs/pkgs/rpms/okteta/devel/okteta.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- okteta.spec	16 Jan 2008 22:01:54 -0000	1.1
+++ okteta.spec	4 Feb 2008 03:41:26 -0000	1.2
@@ -1,13 +1,9 @@
-%define revision 761510
-
-# package the oktetapart (conflicts with the version in kdeutils, but it's
-# currently not built there)
-%define package_kpart 1
+%define revision 770494
 
 Summary: Binary editor
 Name:    okteta
 Version: 0.0.1
-Release: 0.2.20080115svn%{revision}%{?dist}
+Release: 0.3.20080203svn%{revision}%{?dist}
 
 Group:   Applications/Editors
 License: GPLv2
@@ -16,8 +12,6 @@
 Source0: %{name}-%{version}-%{revision}.tar.bz2
 # fix CMakeLists.txt so this builds as a standalone directory (without all of playground-utils)
 Patch0: okteta-0.0.1-755662-cmakelists.patch
-# don't build the oktetapart which conflicts with kdeutils
-Patch1: okteta-0.0.1-755662-cmakelists-no-kparts.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires: cmake
@@ -31,9 +25,6 @@
 %prep
 %setup -q -n %{name}-%{version}-%{revision}
 %patch0 -p1
-%if ! 0%{?package_kpart}
-%patch1 -p1
-%endif
 
 %build
 %cmake_kde4 .
@@ -48,6 +39,10 @@
 # "install" the installed .desktop file to validate it
 # remove the Path key because it is blank (causing a warning)
 desktop-file-install %{buildroot}%{_datadir}/applications/kde4/okteta.desktop --vendor "" --dir %{buildroot}%{_datadir}/applications/kde4 --remove-key=Path
+%find_lang %{name}
+%find_lang oktetapart
+cat oktetapart.lang >>%{name}.lang
+rm -f oktetapart.lang
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -56,7 +51,7 @@
 
 %postun -p /sbin/ldconfig
 
-%files
+%files -f %{name}.lang
 %defattr(-,root,root,-)
 # Hey upstream, where's COPYING?
 %{_kde4_bindir}/okteta
@@ -69,22 +64,25 @@
 %{_kde4_datadir}/icons/hicolor/32x32/apps/okteta.png
 %{_kde4_datadir}/icons/hicolor/48x48/apps/okteta.png
 %{_kde4_appsdir}/okteta/oktetaui.rc
-%if 0%{?package_kpart}
 %{_kde4_libdir}/kde4/libkbytearrayedit.so
 %{_kde4_libdir}/kde4/liboktetapart.so
 %{_kde4_appsdir}/oktetapart/oktetapartui.rc
 %{_kde4_datadir}/kde4/services/kbytearrayedit.desktop
 %{_kde4_datadir}/kde4/services/oktetapart.desktop
-%endif
 
 %changelog
-* Tue Jan 15 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.0.1-0.2.20080115svn761510
+* Mon Feb 4 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.0.1-0.3.20080203svn770494
+- Update to revision 770494
+- Package translations
+- Drop unneeded package_kpart conditional
+
+* Tue Jan 15 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.0.1-0.2.20080115svn761510
 - Use desktop-file-install to ensure the .desktop file is valid
 
-* Tue Jan 15 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.0.1-0.1.20080115svn761510
+* Tue Jan 15 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.0.1-0.1.20080115svn761510
 - Update to revision 761510
 - Enable package_kpart
 - Add missing ldconfig scriptlets for the shared libraries
 
-* Wed Jan 2 2007 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.0.1-0.1.20080102svn755662
+* Wed Jan 2 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> 0.0.1-0.1.20080102svn755662
 - First Fedora package


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/okteta/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	16 Jan 2008 22:01:54 -0000	1.2
+++ sources	4 Feb 2008 03:41:26 -0000	1.3
@@ -1 +1 @@
-04e41470f8ec008b7a8fd6479c081ac8  okteta-0.0.1-761510.tar.bz2
+4c3bc538fa7e4298fb192badf77950bc  okteta-0.0.1-770494.tar.bz2


--- okteta-0.0.1-755662-cmakelists-no-kparts.patch DELETED ---