Hello community, here is the log from the commit of package equalx for openSUSE:Factory checked in at 2014-03-30 12:13:38 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/equalx (Old) and /work/SRC/openSUSE:Factory/.equalx.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "equalx" Changes: -------- --- /work/SRC/openSUSE:Factory/equalx/equalx.changes 2014-03-28 12:10:17.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.equalx.new/equalx.changes 2014-03-30 12:52:58.000000000 +0200 @@ -1,0 +2,16 @@ +Wed Mar 26 21:55:57 UTC 2014 - [email protected] + +- Update to version 0.7.1: + + No list of changes from upstream + + Build process changed: make install no longer does anything; + use 'install' to manually copy generated binary to %{_bindir} + instead +- Use desktop file shipped in upstream tarball + + Drop external .desktop file + + Add equalx-fix-desktop-file.patch: Fix icon tag in shipped + desktop file and categories for compatibility with openSUSE + defined ones; also fix incorrect Version tag usage +- Add BuildRequires on inkscape too, required for generation of + proper hi-res png icons from svg icon file. + +------------------------------------------------------------------- Old: ---- equalx-0.7.0.tar.gz equalx.desktop New: ---- equalx-0.7.1.tar.gz equalx-fix-desktop-file.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ equalx.spec ++++++ --- /var/tmp/diff_new_pack.mZCXZw/_old 2014-03-30 12:52:59.000000000 +0200 +++ /var/tmp/diff_new_pack.mZCXZw/_new 2014-03-30 12:52:59.000000000 +0200 @@ -17,19 +17,21 @@ Name: equalx -Version: 0.7.0 +Version: 0.7.1 Release: 0 Summary: Editor for writing and exporting TeX/LaTeX equations License: GPL-3.0+ Group: Productivity/Publishing/TeX/Frontends Url: http://equalx.sourceforge.net/ Source0: http://downloads.sourceforge.net/equalx/%{name}-%{version}.tar.gz -Source1: %{name}.desktop +# PATCH-FIX-OPENSUSE equalx-fix-desktop-file.patch [email protected] -- Fix icon tag in desktop file and categories for compatibility with openSUSE defined ones +Patch0: equalx-fix-desktop-file.patch BuildRequires: ImageMagick BuildRequires: desktop-file-utils BuildRequires: fdupes BuildRequires: ghostscript BuildRequires: hicolor-icon-theme +BuildRequires: inkscape BuildRequires: libqt4-devel >= 4.8.0 BuildRequires: pkg-config BuildRequires: pkgconfig(exempi-2.0) @@ -54,14 +56,15 @@ %prep %setup -q +%patch0 -p1 sed -i 's/\r$//' LICENSE README %build -qmake QMAKE_CFLAGS="%optflags" QMAKE_CXXFLAGS="%optflags" +qmake DESTDIR="./bin/" QMAKE_CFLAGS="%optflags" QMAKE_CXXFLAGS="%optflags" make %{?_smp_mflags} %install -make INSTALL_ROOT=%{buildroot} install +install -D -p bin/%{name} %{buildroot}%{_bindir}/%{name} # GENERATE HI-RES APPLICATION ICONS pushd resources/icons/equalx @@ -86,7 +89,9 @@ ln -s %{_datadir}/%{name}/resources/icons/equalx/equalx.svg \ %{buildroot}%{_datadir}/icons/hicolor/scalable/apps/equalx.svg -desktop-file-install %{SOURCE1} +desktop-file-install resources/%{name}.desktop +# REMOVE UNUSED DESKTOP FILE +rm %{buildroot}%{_datadir}/%{name}/resources/%{name}.desktop %fdupes %{buildroot}%{_datadir}/%{name} @@ -100,7 +105,7 @@ %files %defattr(-,root,root) -%doc changelog README LICENSE +%doc changelog README LICENSE THANKS %{_bindir}/%{name} # OWN THE 512x512 ICON DIR AS HICOLOR THEME DOES NOT PROVIDE IT YET %dir %{_datadir}/icons/hicolor/512x512 ++++++ equalx-0.7.0.tar.gz -> equalx-0.7.1.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/equalx-0.7.0/equalx.pro new/equalx-0.7.1/equalx.pro --- old/equalx-0.7.0/equalx.pro 2014-03-26 11:16:29.000000000 +0100 +++ new/equalx-0.7.1/equalx.pro 2014-03-26 18:03:41.000000000 +0100 @@ -51,8 +51,6 @@ src \ ui -isEmpty( PREFIX ):PREFIX = /usr/bin -target.path = $$PREFIX INSTALLS += target DISTFILES += resources/templates/* \ resources/icons/menu/* \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/equalx-0.7.0/include/defines.h new/equalx-0.7.1/include/defines.h --- old/equalx-0.7.0/include/defines.h 2014-03-26 11:16:29.000000000 +0100 +++ new/equalx-0.7.1/include/defines.h 2014-03-26 18:14:15.000000000 +0100 @@ -22,7 +22,7 @@ #define APP_FULL_NAME "EqualX - The LaTeX Equation Editor" #define APP_NAME "EqualX" -#define APP_VERSION "0.7.0" +#define APP_VERSION "0.7.1" #define APP_SITE "http://equalx.sourceforge.net/"; #define AUTHOR_NAME "Mihai Niculescu" #define AUTHOR_EMAIL "[email protected]" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/equalx-0.7.0/resources/equalx.desktop new/equalx-0.7.1/resources/equalx.desktop --- old/equalx-0.7.0/resources/equalx.desktop 1970-01-01 01:00:00.000000000 +0100 +++ new/equalx-0.7.1/resources/equalx.desktop 2014-03-26 18:03:41.000000000 +0100 @@ -0,0 +1,18 @@ +[Desktop Entry] +Version=0.7.0 +Exec=equalx +Terminal=false +Type=Application +StartupNotify=false +MimeType=image/png;image/svg+xml;image/jpg; +Icon=equalx-64x64.png +Categories=Qt;KDE;Office;Math; +X-DBUS-StartupType=Unique +Name=EqualX +Name[ro]=EgalX +GenericName=LaTeX Equation Editor +GenericName[ro]=Editor LaTeX de ecuații +Comment=Create equations in LaTeX +Comment[ro]=Creează ecuații folosind LaTeX + + Files old/equalx-0.7.0/resources/icons/equalx/equalx-16x16.png and new/equalx-0.7.1/resources/icons/equalx/equalx-16x16.png differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/equalx-0.7.0/src/HistoryPanel/HistoryListModel.cpp new/equalx-0.7.1/src/HistoryPanel/HistoryListModel.cpp --- old/equalx-0.7.0/src/HistoryPanel/HistoryListModel.cpp 2014-03-26 11:16:29.000000000 +0100 +++ new/equalx-0.7.1/src/HistoryPanel/HistoryListModel.cpp 2014-03-26 18:03:41.000000000 +0100 @@ -99,10 +99,11 @@ void HistoryListModel::onHistoryChanged() { + beginResetModel(); mHistorySize = mLibrary->historySize(); if(mHistorySize==0) mChildren = 0; - QAbstractListModel::resetInternalData(); + endResetModel(); } ++++++ equalx-fix-desktop-file.patch ++++++ Index: equalx-0.7.1/resources/equalx.desktop =================================================================== --- equalx-0.7.1.orig/resources/equalx.desktop +++ equalx-0.7.1/resources/equalx.desktop @@ -1,12 +1,11 @@ [Desktop Entry] -Version=0.7.0 Exec=equalx Terminal=false Type=Application StartupNotify=false MimeType=image/png;image/svg+xml;image/jpg; -Icon=equalx-64x64.png -Categories=Qt;KDE;Office;Math; +Icon=equalx +Categories=Qt;KDE;Office;WordProcessor; X-DBUS-StartupType=Unique Name=EqualX Name[ro]=EgalX -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
