rpms/kbibtex/F-10 .cvsignore, 1.6, 1.7 kbibtex-0.2-desktop-file.patch, 1.1, 1.2 kbibtex.spec, 1.15, 1.16 sources, 1.6, 1.7

[Christian Nolte]

Author: noltec

Update of /cvs/pkgs/rpms/kbibtex/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv2736

Modified Files:
	.cvsignore kbibtex-0.2-desktop-file.patch kbibtex.spec sources 
Log Message:
- Fixed branch issue: Package was not up to date
- desktop-file issue (#468937) is now fixed too



Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/kbibtex/F-10/.cvsignore,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- .cvsignore	31 Mar 2008 19:54:49 -0000	1.6
+++ .cvsignore	4 Dec 2008 20:08:28 -0000	1.7
@@ -1 +1 @@
-kbibtex-0.2.tar.bz2
+kbibtex-0.2.1.tar.bz2

kbibtex-0.2-desktop-file.patch:

Index: kbibtex-0.2-desktop-file.patch
===================================================================
RCS file: /cvs/pkgs/rpms/kbibtex/F-10/kbibtex-0.2-desktop-file.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- kbibtex-0.2-desktop-file.patch	3 Dec 2008 18:29:42 -0000	1.1
+++ kbibtex-0.2-desktop-file.patch	4 Dec 2008 20:08:28 -0000	1.2
@@ -1,25 +1,6 @@
-diff -up kbibtex-0.2/src/kbibtex.desktop.orig kbibtex-0.2/src/kbibtex.desktop
---- kbibtex-0.2/src/kbibtex.desktop.orig	2008-12-03 19:24:28.000000000 +0100
-+++ kbibtex-0.2/src/kbibtex.desktop	2008-12-03 19:24:51.000000000 +0100
-@@ -1,13 +1,11 @@
- [Desktop Entry]
--Encoding=UTF-8
- Name=KBibTeX
--Exec=kbibtex %i %m -caption "%c"
-+Exec=kbibtex %i --miniicon kbibtex -caption "%c"
- Icon=kbibtex
- Type=Application
--DocPath=kbibtex/kbibtex.html
- Comment=A BibTeX editor for KDE
- Comment[de]=Ein BibTeX-Editor für KDE
--Terminal=0
-+Terminal=false
- MimeType=text/x-bibtex;
- Categories=Qt;KDE;Office;
- X-KDE-HasTempFileOption=true
-diff -up kbibtex-0.2/src/kbibtex_part.desktop.orig kbibtex-0.2/src/kbibtex_part.desktop
---- kbibtex-0.2/src/kbibtex_part.desktop.orig	2008-12-03 19:24:36.000000000 +0100
-+++ kbibtex-0.2/src/kbibtex_part.desktop	2008-12-03 19:24:57.000000000 +0100
+diff -up kbibtex-0.2.1/src/kbibtex_part.desktop.orig kbibtex-0.2.1/src/kbibtex_part.desktop
+--- kbibtex-0.2.1/src/kbibtex_part.desktop.orig	2008-12-04 20:55:25.000000000 +0100
++++ kbibtex-0.2.1/src/kbibtex_part.desktop	2008-12-04 20:55:39.000000000 +0100
 @@ -1,5 +1,4 @@
  [Desktop Entry]
 -Encoding=UTF-8


Index: kbibtex.spec
===================================================================
RCS file: /cvs/pkgs/rpms/kbibtex/F-10/kbibtex.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- kbibtex.spec	3 Dec 2008 18:49:34 -0000	1.15
+++ kbibtex.spec	4 Dec 2008 20:08:28 -0000	1.16
@@ -1,13 +1,13 @@
-Name:		kbibtex
-Version:	0.2
+Name:		  kbibtex
+Version:	0.2.1
 Release:	23%{?dist}
 Summary:	A BibTeX editor for KDE  
 
 Group:		Applications/Editors
 License:	GPLv2+
-URL:		http://www.unix-ag.uni-kl.de/~fischer/kbibtex/
+URL:		  http://www.unix-ag.uni-kl.de/~fischer/kbibtex/
 Source0:	http://www.unix-ag.uni-kl.de/~fischer/kbibtex/download/kbibtex-%{version}.tar.bz2
-Patch1:		kbibtex-0.2-desktop-file.patch
+Patch0:   kbibtex-0.2-desktop-file.patch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  kdelibs3-devel >= 3.3 libxslt-devel desktop-file-utils
@@ -20,7 +20,7 @@
 
 %prep
 %setup -q
-%patch1 -p1 -b .desktop-file
+%patch0 -p1 -b .desktop-file
 
 %build
 unset QTDIR || : ; . /etc/profile.d/qt.sh
@@ -46,7 +46,7 @@
         --dir ${RPM_BUILD_ROOT}%{_datadir}/applications		\
         --add-category X-Fedora					\
 	--delete-original \
-	${RPM_BUILD_ROOT}%{_datadir}/applnk/Office/kbibtex.desktop
+	${RPM_BUILD_ROOT}%{_datadir}/applications/kde/kbibtex.desktop
 
 #
 # Install the icons into the hicolor folder
@@ -101,6 +101,9 @@
 %{_datadir}/apps/kbibtexpart/ 
 %{_datadir}/apps/kbibtex/ 
 %{_docdir}/HTML/en/kbibtex/ 
+
+%{_datadir}/locale/de/LC_MESSAGES/kbibtex.mo
+%{_datadir}/locale/ru/LC_MESSAGES/kbibtex.mo
 %{_datadir}/icons/hicolor/128x128/apps/kbibtex.png
 %{_datadir}/icons/hicolor/16x16/apps/kbibtex.png
 %{_datadir}/icons/hicolor/22x22/apps/kbibtex.png
@@ -116,6 +119,8 @@
 %changelog
 * Wed Dec 03 2008 Christian Nolte <ch.nolte at noltec.org> - 0.2-23
 - Desktop files are now conform to the latest freedesktop spec. (#468937)
+- Update to version 0.2.1. Seems that mass branching has picked up the F-7
+  branch. 
 
 * Mon Mar 31 2008 Kevin Kofler <Kevin at tigcc.ticalc.org> - 0.2-14
 - BR kdelibs3-devel instead of kdebase-devel (should not need kdebase) (#434344)


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/kbibtex/F-10/sources,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- sources	31 Mar 2008 19:54:49 -0000	1.6
+++ sources	4 Dec 2008 20:08:28 -0000	1.7
@@ -1 +1 @@
-4ed33020f68c970e5ec37a20d3a49b59  kbibtex-0.2.tar.bz2
+8d2b142a8878e86398a30786ede674e1  kbibtex-0.2.1.tar.bz2