Mailinglist Archive: opensuse-commit (1193 mails)

< Previous

Next >

Hello community,

here is the log from the commit of package kseg
checked in at Mon Mar 24 09:42:32 CET 2008.

--------
--- kseg/kseg.changes 2006-02-15 10:25:39.000000000 +0100
+++ /mounts/work_src_done/STABLE/kseg/kseg.changes 2008-03-22
16:23:44.000000000 +0100
@@ -1,0 +2,23 @@
+Sat Mar 22 14:14:08 CET 2008 - lars@xxxxxxxxxxxxxxxxxxxx
+
+- added translation into Mongolian
+- added patch for distribution default LanguageDir and
+ QuickPlayDirectory (kseg-KSEG_HOME.patch)
+- try to find the right language help file automatically
+ (kseg-setFilePath.patch)
+- added kseg icon for menu entry
+
+-------------------------------------------------------------------
+Fri Mar 21 02:15:21 CET 2008 - lars@xxxxxxxxxxxxxxxxxxxx
+
+- also package the img, html and qm files into %_datadir/%name
+
+-------------------------------------------------------------------
+Mon Mar 17 21:24:18 CET 2008 - lars@xxxxxxxxxxxxxxxxxxxx
+
+- update to 0.403:
+ + uses qmake for building
+ + build on Qt 3.x without the compatibility headers
+ + Traditional Chinese translation and help file included
+
+-------------------------------------------------------------------

Old:
----
assert.dif
cast.dif
kseg-0.4.tar.gz

New:
----
kseg-0.403.tar.bz2
kseg-assert.patch
kseg-KSEG_HOME.patch
kseg_mn.qm
kseg-setFilePath.patch
kseg.xpm

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ kseg.spec ++++++
--- /var/tmp/diff_new_pack.z24871/_old 2008-03-24 09:42:11.000000000 +0100
+++ /var/tmp/diff_new_pack.z24871/_new 2008-03-24 09:42:11.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package kseg (Version 0.4)
+# spec file for package kseg (Version 0.403)
#
-# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
@@ -10,21 +10,25 @@

# norootforbuild

+
Name: kseg
-BuildRequires: libdrm-devel libjpeg-devel qt3-devel update-desktop-files
-License: GPL
+Summary: A Simulator of Euclidean Geometry
+Version: 0.403
+Release: 1
+License: GPL v2 or later
Group: Productivity/Scientific/Math
-URL: http://www.mit.edu/~ibaran
+Url: http://www.mit.edu/~ibaran
+AutoReqProv: on
+BuildRequires: libdrm-devel libjpeg-devel qt3-devel update-desktop-files
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-Autoreqprov: on
-Summary: A Simulator of Euclidean Geometry
-Version: 0.4
-Release: 205
-Source0: %name-%version.tar.gz
+Source0: %name-%version.tar.bz2
Source1: %name.desktop
-Patch0: assert.dif
-Patch1: cast.dif
-#Patch1: kseg-0.3-qt3.dif
+Source2: %name.xpm
+Source10: kseg_mn.qm
+Patch0: kseg-assert.patch
+Patch1: kseg-KSEG_HOME.patch
+Patch2: kseg-setFilePath.patch
+%define kseg_home %_datadir/%name

%description
KSEG is a program for exploring Euclidean geometry. You can create a
@@ -40,52 +44,76 @@
Ilya Baran <ibaran@xxxxxxx>

%prep
-%setup -q
+%setup -q -n %name
%patch0 -p1
-%patch1
-#%patch2 -p1
+%patch1 -p1
+%patch2 -p1
+# fix home path
+sed -i "s|@KSEG_HOME@|%{kseg_home}|g" main.cpp

%build
export QTDIR=/usr/lib/qt3
-make QTDIR=$QTDIR LIBS=" -lm -L$QTDIR/%_lib -lqt-mt -lz"
+qmake QTDIR=$QTDIR LIBS=" -lm -L$QTDIR/%_lib -lqt-mt -lz"
+make QTDIR=$QTDIR LIBS=" -lm -L$QTDIR/%_lib -lqt-mt -lz"
KSEG_HOME="%{kseg_home}"

%install
-rm -rf $RPM_BUILD_ROOT
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/bin
-install kseg $RPM_BUILD_ROOT%{_prefix}/bin
+mkdir -p %buildroot%{kseg_home}/{examples,pics,locale}
+install -Dm755 kseg %buildroot%{_bindir}/%name
+install -p -m644 *.qm *.html %buildroot%{kseg_home}/locale/
+install -p -m644 examples/* %buildroot%{kseg_home}/examples/
+install -p -m644 pics/* %buildroot%{kseg_home}/pics/
+# install additional locales
+install -m644 %{SOURCE10} %buildroot%_datadir/%name/locale/
+# install desktop icon and entry
+install -Dm644 %{SOURCE2} %buildroot%_datadir/pixmaps/%name.xpm
%suse_update_desktop_file -i %name Edutainment Math

%clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %buildroot

%files
%defattr(-,root,root)
-/usr/bin/kseg
-/usr/share/applications/%name.desktop
-%doc COPYING AUTHORS ChangeLog README
+%doc COPYING AUTHORS README
%doc README.translators VERSION
-%doc examples
-
-%changelog -n kseg
-* Wed Feb 15 2006 - stbinner@xxxxxxx
+%_bindir/kseg
+%_datadir/applications/%name.desktop
+%_datadir/pixmaps/%name.xpm
+%{kseg_home}
+
+%changelog
+* Sat Mar 22 2008 lars@xxxxxxxxxxxxxxxxxxxx
+- added translation into Mongolian
+- added patch for distribution default LanguageDir and
+ QuickPlayDirectory (kseg-KSEG_HOME.patch)
+- try to find the right language help file automatically
+ (kseg-setFilePath.patch)
+- added kseg icon for menu entry
+* Fri Mar 21 2008 lars@xxxxxxxxxxxxxxxxxxxx
+- also package the img, html and qm files into %%_datadir/%%name
+* Mon Mar 17 2008 lars@xxxxxxxxxxxxxxxxxxxx
+- update to 0.403:
+ + uses qmake for building
+ + build on Qt 3.x without the compatibility headers
+ + Traditional Chinese translation and help file included
+* Wed Feb 15 2006 stbinner@xxxxxxx
- fixed .desktop file
-* Wed Jan 25 2006 - mls@xxxxxxx
+* Wed Jan 25 2006 mls@xxxxxxx
- converted neededforbuild to BuildRequires
-* Sat Jan 10 2004 - adrian@xxxxxxx
+* Sat Jan 10 2004 adrian@xxxxxxx
- build as user
-* Sat Aug 16 2003 - adrian@xxxxxxx
+* Sat Aug 16 2003 adrian@xxxxxxx
- add desktop file
-* Wed Aug 06 2003 - uwedr@xxxxxxx
+* Wed Aug 06 2003 uwedr@xxxxxxx
- Update to version 0.4
-* Tue Feb 25 2003 - aj@xxxxxxx
+* Tue Feb 25 2003 aj@xxxxxxx
- Include missing assert.h.
-* Tue Nov 19 2002 - ro@xxxxxxx
+* Tue Nov 19 2002 ro@xxxxxxx
- build with qt3
-* Tue Jun 11 2002 - ro@xxxxxxx
+* Tue Jun 11 2002 ro@xxxxxxx
- fix linking on lib64 platforms
-* Fri Apr 19 2002 - coolo@xxxxxxx
+* Fri Apr 19 2002 coolo@xxxxxxx
- fix for gcc 3.1
-* Fri Nov 09 2001 - ro@xxxxxxx
+* Fri Nov 09 2001 ro@xxxxxxx
- use qt-devel-packages in neededforbuild
-* Fri Jun 08 2001 - uwedr@xxxxxxx
+* Fri Jun 08 2001 uwedr@xxxxxxx
- Spec file created from kseg-0.3.tar.gz

++++++ kseg-assert.patch ++++++
Index: kseg/menu.cpp
===================================================================
--- kseg.orig/menu.cpp
+++ kseg/menu.cpp
@@ -20,6 +20,7 @@
* ibaran@xxxxxxx
*/

+#include <cassert>
#include <iostream>
#include <qlayout.h>
#include <qdialog.h>
++++++ kseg.desktop ++++++
--- kseg/kseg.desktop 2006-02-15 10:25:39.000000000 +0100
+++ /mounts/work_src_done/STABLE/kseg/kseg.desktop 2008-03-22
16:23:45.000000000 +0100
@@ -1,5 +1,8 @@
[Desktop Entry]
+Encoding=UTF-8
Type=Application
Exec=kseg
+Icon=kseg
Name=KSeg
-GenericName=Interactive Geometry
+GenericName=Interactive Euclidean Geometry
+Terminal=false

++++++ kseg-KSEG_HOME.patch ++++++
diff -ur kseg/main.cpp kseg.old/main.cpp
--- kseg/main.cpp 2007-06-08 14:57:51 +0400
+++ kseg.old/main.cpp 2007-06-08 15:18:45 +0400
@@ -27,6 +27,9 @@
#include "KSegWindow.H"
#include "G_ref.H"
#include "KSegProperties.H"
+#ifndef KSEG_HOME
+# define KSEG_HOME "@KSEG_HOME@"
+#endif

int main(int argc, char **argv)
{
@@ -37,9 +40,9 @@

//set some default properties
KSegProperties::setPropertyDefault("Language", "");
- KSegProperties::setPropertyDefault("LanguageDir", ".");
+ KSegProperties::setPropertyDefault("LanguageDir", KSEG_HOME +
QString("/locale"));
KSegProperties::setPropertyDefault("SelectType", "BorderSelect");
- KSegProperties::setPropertyDefault("QuickPlayDirectory", ".");
+ KSegProperties::setPropertyDefault("QuickPlayDirectory", KSEG_HOME +
QString("/examples"));
KSegProperties::setPropertyDefault("RecentListSize", "4");
KSegProperties::setPropertyDefault("BackgroundColor", Qt::white.name());
KSegProperties::setPropertyDefault("ForegroundColor", Qt::black.name());
++++++ kseg-setFilePath.patch ++++++
diff -ur kseg/KSegWindow.cpp kseg.orig/KSegWindow.cpp
--- kseg/KSegWindow.cpp 2007-06-08 14:07:49 +0400
+++ kseg.orig/KSegWindow.cpp 2007-06-08 14:46:58 +0400
@@ -950,17 +950,16 @@
void KSegWindow::help()
{
QString langChars = KSegProperties::getProperty("Language").mid(5, 2);
- QString helpSource = KSegProperties::getProperty("LanguageDir") +
"/kseg_help_";
- helpSource = helpSource + langChars + ".html";
+ QString langDir = KSegProperties::getProperty("LanguageDir");
+ QString helpSource = "kseg_help_" + langChars + ".html";
//the above assumes the language is kseg_??.qm and the helpfile is in the
language directory

- if(QFileInfo(helpSource).exists() == false)
- helpSource = KSegProperties::getProperty("LanguageDir") +
"/kseg_help_en.html";
+ if(QFileInfo(langDir + "/" + helpSource).exists() == false)
+ helpSource = "kseg_help_en.html";

- if(QFileInfo(helpSource).exists() == false) {
+ if(QFileInfo(langDir + "/" + helpSource).exists() == false) {
QMessageBox::warning(0, tr("File Not Found"),
- tr("Sorry, I am afraid that file %1 does not
exist.").arg(helpSource),
- QMessageBox::Ok, 0);
+ tr("Sorry, I am afraid that file '%1' does not exist
at '%2' directory.").arg(helpSource,langDir), QMessageBox::Ok, 0);

return;
}
@@ -973,6 +972,7 @@
charset = "text/html;charset=Windows-1254";

QTextBrowser *b = new QTextBrowser();
+ b->mimeSourceFactory()->setFilePath(langDir);
b->mimeSourceFactory()->setExtensionType("html", charset);
b->setSource(helpSource);
b->setCaption(b->documentTitle());

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous

Next >

Mailinglist Archive: opensuse-commit (1193 mails)

commit kseg

Search this list

List Navigation

This Thread