commit a0fd91c2c0fb1016aea6b3dd4bb2a67eb9c92576 Author: Tom "spot" Callaway tcallawa@redhat.com Date: Mon Oct 25 10:38:09 2010 -0400
initial commit
.gitignore | 1 + sources | 1 + ucviewer-20101019-no-prompting.patch | 67 ++++++++++++++ ucviewer-20101019-system-lua.patch | 168 ++++++++++++++++++++++++++++++++++ ucviewer.desktop | 9 ++ ucviewer.spec | 65 +++++++++++++ 6 files changed, 311 insertions(+), 0 deletions(-) --- diff --git a/.gitignore b/.gitignore index e69de29..4fca460 100644 --- a/.gitignore +++ b/.gitignore @@ -0,0 +1 @@ +/ucviewer-20101019.tar.bz2 diff --git a/sources b/sources index e69de29..d288923 100644 --- a/sources +++ b/sources @@ -0,0 +1 @@ +08c0f42cff790bbc5826355b548e6339 ucviewer-20101019.tar.bz2 diff --git a/ucviewer-20101019-no-prompting.patch b/ucviewer-20101019-no-prompting.patch new file mode 100644 index 0000000..2ad47f9 --- /dev/null +++ b/ucviewer-20101019-no-prompting.patch @@ -0,0 +1,67 @@ +diff -up ucviewer-20101019/UnicodeViewer.pro.no-prompting ucviewer-20101019/UnicodeViewer.pro +--- ucviewer-20101019/UnicodeViewer.pro.no-prompting 2010-10-19 16:44:15.876522001 -0400 ++++ ucviewer-20101019/UnicodeViewer.pro 2010-10-19 16:50:33.419522003 -0400 +@@ -97,35 +97,34 @@ unix:!macx { + + # Install only for release. + CONFIG(release, debug|release) { +- INSTALL = $$prompt("Do you want to install Unicode Viewer? y=Yes, n=No") +- contains(INSTALL,y|yes|yEs|yES|yeS|Y|Yes|YeS|YES|YEs) { +- message("Configured for install.") +- DEFINES += LINUX +- HELP = /usr/local/share/UnicodeViewer/help +- DEFINES += HELPPATH=\"$$HELP\" +- RESOURCEPATH = /usr/local/share/UnicodeViewer +- DEFINES += RESOURCEPATH=\"$$RESOURCEPATH\" +- TRANSLATIONPATH = /usr/local/share/UnicodeViewer/ +- DEFINES += TRANSLATIONPATH=\"$$TRANSLATIONPATH\" +- target.path = /usr/local/bin +- help.path = $$HELP +- help.files = help/* +- lua.path = $$RESOURCEPATH +- lua.files = lua/init.lua \ +- lua/de_DE.lua \ +- lua/en_EN.lua +- resource.path = $$TRANSLATIONPATH +- resource.files = resource/*.ts \ +- resource/*.qm +- icon.path = /usr/local/share/UnicodeViewer/icon +- icon.files = icon/uc-book.ico \ +- icon/uc-book.png +- INSTALLS += help \ +- lua \ +- resource \ +- icon \ +- target +- } ++ message("Configured for install.") ++ DEFINES += LINUX ++ LIBS += -llua -lm -ldl ++ DESTDIR = ++ HELP = /usr/share/UnicodeViewer/help ++ DEFINES += HELPPATH=\"$$HELP\" ++ RESOURCEPATH = /usr/share/UnicodeViewer ++ DEFINES += RESOURCEPATH=\"$$RESOURCEPATH\" ++ TRANSLATIONPATH = /usr/share/UnicodeViewer/ ++ DEFINES += TRANSLATIONPATH=\"$$TRANSLATIONPATH\" ++ target.path = /usr/bin ++ help.path = $$HELP ++ help.files = help/* ++ lua.path = $$RESOURCEPATH ++ lua.files = lua/init.lua \ ++ lua/de_DE.lua \ ++ lua/en_EN.lua ++ resource.path = $$TRANSLATIONPATH ++ resource.files = resource/*.ts \ ++ resource/*.qm ++ icon.path = /usr/share/UnicodeViewer/icon ++ icon.files = icon/uc-book.ico \ ++ icon/uc-book.png ++ INSTALLS += help \ ++ lua \ ++ resource \ ++ icon \ ++ target + } + } + diff --git a/ucviewer-20101019-system-lua.patch b/ucviewer-20101019-system-lua.patch new file mode 100644 index 0000000..adc0ef9 --- /dev/null +++ b/ucviewer-20101019-system-lua.patch @@ -0,0 +1,168 @@ +diff -up ucviewer-20101019/src/lua/LuaOutput.h.system ucviewer-20101019/src/lua/LuaOutput.h +--- ucviewer-20101019/src/lua/LuaOutput.h.system 2010-10-19 15:35:53.069522001 -0400 ++++ ucviewer-20101019/src/lua/LuaOutput.h 2010-10-19 15:36:00.830522001 -0400 +@@ -22,9 +22,9 @@ + #define LUAOUTPUT_H_ + + extern "C" { +-#include "lua-5.1.4/src/lua.h" +-#include "lua-5.1.4/src/lualib.h" +-#include "lua-5.1.4/src/lauxlib.h" ++#include <lua.h> ++#include <lualib.h> ++#include <lauxlib.h> + } + #include "lua/LuaWrapper.h" + #include "lua/Luna.h" +diff -up ucviewer-20101019/src/lua/LuaSearch.h.system ucviewer-20101019/src/lua/LuaSearch.h +--- ucviewer-20101019/src/lua/LuaSearch.h.system 2010-10-19 15:36:13.865522002 -0400 ++++ ucviewer-20101019/src/lua/LuaSearch.h 2010-10-19 15:36:21.210522002 -0400 +@@ -21,9 +21,9 @@ + #ifndef LUASEARCH_H_ + #define LUASEARCH_H_ + extern "C" { +-#include "lua-5.1.4/src/lua.h" +-#include "lua-5.1.4/src/lualib.h" +-#include "lua-5.1.4/src/lauxlib.h" ++#include <lua.h> ++#include <lualib.h> ++#include <lauxlib.h> + } + #include "lua/Luna.h" + #include "controller/SearchController.h" +diff -up ucviewer-20101019/src/lua/LuaSort.h.system ucviewer-20101019/src/lua/LuaSort.h +--- ucviewer-20101019/src/lua/LuaSort.h.system 2010-10-19 15:36:28.770521998 -0400 ++++ ucviewer-20101019/src/lua/LuaSort.h 2010-10-19 15:36:36.832522001 -0400 +@@ -21,9 +21,9 @@ + #ifndef LUASORT_H_ + #define LUASORT_H_ + extern "C" { +-#include "lua-5.1.4/src/lua.h" +-#include "lua-5.1.4/src/lualib.h" +-#include "lua-5.1.4/src/lauxlib.h" ++#include <lua.h> ++#include <lualib.h> ++#include <lauxlib.h> + } + #include "lua/Luna.h" + #include "controller/SortController.h" +diff -up ucviewer-20101019/src/lua/LuaTable.h.system ucviewer-20101019/src/lua/LuaTable.h +--- ucviewer-20101019/src/lua/LuaTable.h.system 2010-10-19 15:36:43.158522002 -0400 ++++ ucviewer-20101019/src/lua/LuaTable.h 2010-10-19 15:36:51.894521997 -0400 +@@ -22,9 +22,9 @@ + #define LUATABLE_H_ + + extern "C" { +-#include "lua-5.1.4/src/lua.h" +-#include "lua-5.1.4/src/lualib.h" +-#include "lua-5.1.4/src/lauxlib.h" ++#include <lua.h> ++#include <lualib.h> ++#include <lauxlib.h> + } + #include "lua/Luna.h" + #include "controller/TableController.h" +diff -up ucviewer-20101019/src/lua/LuaWrapper.h.system ucviewer-20101019/src/lua/LuaWrapper.h +--- ucviewer-20101019/src/lua/LuaWrapper.h.system 2010-10-19 15:35:13.236522002 -0400 ++++ ucviewer-20101019/src/lua/LuaWrapper.h 2010-10-19 15:35:36.524522006 -0400 +@@ -22,9 +22,9 @@ + #define LUAWRAPPER_H_ + + extern "C" { +-#include "lua-5.1.4/src/lua.h" +-#include "lua-5.1.4/src/lualib.h" +-#include "lua-5.1.4/src/lauxlib.h" ++#include <lua.h> ++#include <lualib.h> ++#include <lauxlib.h> + } + #include "controller/Controller.h" + #include <QString> +diff -up ucviewer-20101019/UnicodeViewer.pro.system ucviewer-20101019/UnicodeViewer.pro +--- ucviewer-20101019/UnicodeViewer.pro.system 2010-09-26 12:34:58.000000000 -0400 ++++ ucviewer-20101019/UnicodeViewer.pro 2010-10-19 15:34:38.826522001 -0400 +@@ -27,29 +27,6 @@ HEADERS += src/tools/UCQExecuteLuaThread + src/lua/LuaSort.h \ + src/controller/SortController.h \ + src/controller/TableController.h \ +- src/lua-5.1.4/src/lapi.h \ +- src/lua-5.1.4/src/lauxlib.h \ +- src/lua-5.1.4/src/lcode.h \ +- src/lua-5.1.4/src/ldebug.h \ +- src/lua-5.1.4/src/ldo.h \ +- src/lua-5.1.4/src/lfunc.h \ +- src/lua-5.1.4/src/lgc.h \ +- src/lua-5.1.4/src/llex.h \ +- src/lua-5.1.4/src/llimits.h \ +- src/lua-5.1.4/src/lmem.h \ +- src/lua-5.1.4/src/lobject.h \ +- src/lua-5.1.4/src/lopcodes.h \ +- src/lua-5.1.4/src/lparser.h \ +- src/lua-5.1.4/src/lstate.h \ +- src/lua-5.1.4/src/lstring.h \ +- src/lua-5.1.4/src/ltable.h \ +- src/lua-5.1.4/src/ltm.h \ +- src/lua-5.1.4/src/lua.h \ +- src/lua-5.1.4/src/luaconf.h \ +- src/lua-5.1.4/src/lualib.h \ +- src/lua-5.1.4/src/lundump.h \ +- src/lua-5.1.4/src/lvm.h \ +- src/lua-5.1.4/src/lzio.h \ + src/tools/UCTools.h \ + src/mainwindow/mainwindow.h \ + src/controller/LuaController.h \ +@@ -80,38 +57,6 @@ SOURCES += src/tools/UCQExecuteLuaThread + src/lua/LuaSort.cpp \ + src/controller/SortController.cpp \ + src/controller/TableController.cpp \ +- src/lua-5.1.4/src/lapi.c \ +- src/lua-5.1.4/src/lauxlib.c \ +- src/lua-5.1.4/src/lbaselib.c \ +- src/lua-5.1.4/src/lcode.c \ +- src/lua-5.1.4/src/ldblib.c \ +- src/lua-5.1.4/src/ldebug.c \ +- src/lua-5.1.4/src/ldo.c \ +- src/lua-5.1.4/src/ldump.c \ +- src/lua-5.1.4/src/lfunc.c \ +- src/lua-5.1.4/src/lgc.c \ +- src/lua-5.1.4/src/linit.c \ +- src/lua-5.1.4/src/liolib.c \ +- src/lua-5.1.4/src/llex.c \ +- src/lua-5.1.4/src/lmathlib.c \ +- src/lua-5.1.4/src/lmem.c \ +- src/lua-5.1.4/src/loadlib.c \ +- src/lua-5.1.4/src/lobject.c \ +- src/lua-5.1.4/src/lopcodes.c \ +- src/lua-5.1.4/src/loslib.c \ +- src/lua-5.1.4/src/lparser.c \ +- src/lua-5.1.4/src/lstate.c \ +- src/lua-5.1.4/src/lstring.c \ +- src/lua-5.1.4/src/lstrlib.c \ +- src/lua-5.1.4/src/ltable.c \ +- src/lua-5.1.4/src/ltablib.c \ +- src/lua-5.1.4/src/ltm.c \ +- src/lua-5.1.4/src/lua.c \ +- src/lua-5.1.4/src/luac.c \ +- src/lua-5.1.4/src/lundump.c \ +- src/lua-5.1.4/src/lvm.c \ +- src/lua-5.1.4/src/lzio.c \ +- src/lua-5.1.4/src/print.c \ + src/tools/UCTools.cpp \ + src/mainwindow/mainwindow.cpp \ + src/controller/LuaController.cpp \ +diff -up ucviewer-20101019/src/controller/LuaController.h.system ucviewer-20101019/src/controller/LuaController.h +--- ucviewer-20101019/src/controller/LuaController.h.system 2010-10-19 16:06:44.837522001 -0400 ++++ ucviewer-20101019/src/controller/LuaController.h 2010-10-19 16:07:07.446522002 -0400 +@@ -20,9 +20,9 @@ + #ifndef LUACONTROLLER_H_ + #define LUACONTROLLER_H_ + extern "C" { +-#include "lua-5.1.4/src/lua.h" +-#include "lua-5.1.4/src/lualib.h" +-#include "lua-5.1.4/src/lauxlib.h" ++#include <lua.h> ++#include <lualib.h> ++#include <lauxlib.h> + } + #include "lua/Luna.h" + #include "lua/LuaTable.h" diff --git a/ucviewer.desktop b/ucviewer.desktop new file mode 100644 index 0000000..9d0ffb9 --- /dev/null +++ b/ucviewer.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Exec=UnicodeViewer +Icon=uc-book +Terminal=false +Name=UnicodeViewer +GenericName=Unicode Table Viewer +Type=Application +Categories=Graphics; +StartupNotify=true diff --git a/ucviewer.spec b/ucviewer.spec new file mode 100644 index 0000000..bde97f4 --- /dev/null +++ b/ucviewer.spec @@ -0,0 +1,65 @@ +%global svndate 20101019 +%global svnrev 4 + +Name: ucviewer +# The only place I could find a version was in the documentation. +Version: 0.1 +Release: 0.2.%{svndate}svn%{svnrev}%{?dist} +Summary: A tool for browsing Unicode tables +Group: Applications/System +License: GPLv2+ +URL: http://sourceforge.net/projects/ucviewer/ +# Upstream does not release versioned tarballs +# Also, they bundle a copy of lua. :P +# svn export https://ucviewer.svn.sourceforge.net/svnroot/ucviewer ucviewer-20101019 +# rm -rf ucviewer-20101019/src/lua-5.1.4 +# tar cfj ucviewer-20101019.tar.bz2 ucviewer-20101019 +Source0: %{name}-%{svndate}.tar.bz2 +# Desktop file not provided by upstream +Source1: %{name}.desktop +# Use system lua +Patch0: %{name}-20101019-system-lua.patch +# Don't prompt on buildtype (and use sane system paths) +Patch1: %{name}-20101019-no-prompting.patch +BuildRequires: lua-devel, qt-devel +BuildRequires: desktop-file-utils + +%description +Unicode Viewer is a tool for browsing Unicode tables to obtain detailed +information about every glyph. It provides a GUI with multiple functions +for navigating through the data and a Lua scripting interface to create +new functions. It also displays each glyph's DUCET-information and +allows sorting according to an order specified in an allkeys.txt-File. + +%prep +%setup -q -n %{name}-%{svndate} +%patch0 -p1 -b .system +%patch1 -p1 -b .no-prompting + +%build +qmake-qt4 +make %{?_smp_mflags} + +%install +make INSTALL_ROOT=%{buildroot} install +mkdir %{buildroot}%{_datadir}/pixmaps +pushd %{buildroot}%{_datadir}/pixmaps +ln -s ../UnicodeViewer/icon/uc-book.png . +popd +desktop-file-install --dir %{buildroot}%{_datadir}/applications %{SOURCE1} + +%files +%defattr(-,root,root,-) +%doc License.txt ReadMe.txt +%{_bindir}/UnicodeViewer +%{_datadir}/applications/ucviewer.desktop +%{_datadir}/pixmaps/uc-book.png +%{_datadir}/UnicodeViewer/ + +%changelog +* Wed Oct 19 2010 Tom "spot" Callaway tcallawa@redhat.com 0.1-0.2.20101019svn4 +- fix license tag +- fix desktop file + +* Tue Oct 19 2010 Tom "spot" Callaway tcallawa@redhat.com 0.1-0.1.20101019svn4 +- initial package for Fedora
fonts-bugs@lists.fedoraproject.org