From c30667b9bf355a7945afba4cf058072229309271 Mon Sep 17 00:00:00 2001 From: maciek2w Date: Sun, 5 Feb 2006 17:41:02 +0000 Subject: [PATCH] - updated to 0.4.0 - fixed help location Changed files: bless-DESTDIR.patch -> 1.3 bless-help.patch -> 1.1 bless.spec -> 1.4 --- bless-DESTDIR.patch | 161 ++++++++++++++++++++++++++++++++++++++------ bless-help.patch | 11 +++ bless.spec | 39 ++++++++--- 3 files changed, 183 insertions(+), 28 deletions(-) create mode 100644 bless-help.patch diff --git a/bless-DESTDIR.patch b/bless-DESTDIR.patch index 06ad23b..7bddcb8 100644 --- a/bless-DESTDIR.patch +++ b/bless-DESTDIR.patch @@ -1,19 +1,142 @@ -diff -ur bless-0.3.1/src/Makefile bless-0.3.1.new/src/Makefile ---- bless-0.3.1/src/Makefile 2005-02-14 14:13:56.000000000 +0000 -+++ bless-0.3.1.new/src/Makefile 2005-03-03 20:53:47.563879256 +0000 -@@ -76,11 +76,11 @@ - $(MCS) -t:library -r:nunit.framework -pkg:gtk-sharp $< - - install: bless.exe -- install -c -d $(PREFIX)/lib/bless/bin/ -- install -c bless.exe $(PREFIX)/lib/bless/bin/ -+ install -c -d $(DESTDIR)$(PREFIX)/lib/bless/bin/ -+ install -c bless.exe $(DESTDIR)$(PREFIX)/lib/bless/bin/ - echo -e "#!/bin/sh\ncd $(PREFIX)/lib/bless/bin/; mono bless.exe \"\$$@\"" > bless -- install -c -d $(PREFIX)/bin -- install -c bless $(PREFIX)/bin -+ install -c -d $(DESTDIR)$(PREFIX)/bin -+ install -c bless $(DESTDIR)$(PREFIX)/bin - rm bless - - uninstall: +--- bless-0.4.0/src/Makefile.am.orig 2006-02-05 17:04:26.000000000 +0100 ++++ bless-0.4.0/src/Makefile.am 2006-02-05 17:05:17.000000000 +0100 +@@ -106,10 +106,10 @@ + sed -e 's,@blesslibdir\@,$(libdir),g' bless-script > bless + + install-exec-local: bless.exe +- $(INSTALL) -d $(libdir)/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/bin +- $(INSTALL_DATA) bless.exe $(libdir)/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/bin +- $(INSTALL) -d $(bindir) +- $(INSTALL_SCRIPT) bless $(bindir) ++ $(INSTALL) -d $(DESTDIR)$(libdir)/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/bin ++ $(INSTALL_DATA) bless.exe $(DESTDIR)$(libdir)/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/bin ++ $(INSTALL) -d $(DESTDIR)$(bindir) ++ $(INSTALL_SCRIPT) bless $(DESTDIR)$(bindir) + + uninstall-local: + rm -rf $(libdir)/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/bin +--- bless-0.4.0/doc/user/Makefile.am.orig 2006-02-05 17:08:51.000000000 +0100 ++++ bless-0.4.0/doc/user/Makefile.am 2006-02-05 17:09:47.000000000 +0100 +@@ -22,14 +22,14 @@ + cp --parents $(DOCS) $(OMF).in $(wildcard *.html) $(FIGURES) $(distdir) + + install-data-local: +- $(INSTALL) -d $(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/user +- $(INSTALL) -d $(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/user/figures +- $(INSTALL_DATA) $(DOCS) $(wildcard *.html) $(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/user +- $(INSTALL_DATA) $(FIGURES) $(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/user/figures +- $(INSTALL) -d $(datadir)/omf/$(PACKAGE_NAME) +- $(INSTALL_DATA) $(OMF) $(datadir)/omf/$(PACKAGE_NAME) ++ $(INSTALL) -d $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/user ++ $(INSTALL) -d $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/user/figures ++ $(INSTALL_DATA) $(DOCS) $(wildcard *.html) $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/user ++ $(INSTALL_DATA) $(FIGURES) $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/user/figures ++ $(INSTALL) -d $(DESTDIR)$(datadir)/omf/$(PACKAGE_NAME) ++ $(INSTALL_DATA) $(OMF) $(DESTDIR)$(datadir)/omf/$(PACKAGE_NAME) + if WITH_SCROLLKEEPER +- scrollkeeper-update -o $(datadir)/omf/$(PACKAGE_NAME) ++ scrollkeeper-update -o $(DESTDIR)$(datadir)/omf/$(PACKAGE_NAME) + endif + + uninstall-local: +--- bless-0.4.0/doc/developer/Makefile.am.orig 2005-05-03 23:42:46.000000000 +0200 ++++ bless-0.4.0/doc/developer/Makefile.am 2006-02-05 17:16:58.000000000 +0100 +@@ -5,8 +5,8 @@ + + + install-data-local: +- $(INSTALL) -d $(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/developer +- $(INSTALL_DATA) $(DOCS) $(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/developer ++ $(INSTALL) -d $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/developer ++ $(INSTALL_DATA) $(DOCS) $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/developer + + uninstall-local: + rm -rf $(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/developer +--- bless-0.4.0/data/Makefile.am.orig 2006-02-05 17:17:47.000000000 +0100 ++++ bless-0.4.0/data/Makefile.am 2006-02-05 17:18:05.000000000 +0100 +@@ -15,16 +15,16 @@ + sed -e 's,@blessdocdir\@,$(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION),g' help_script.tmpl > help_script.sh.install + + install-data-local: +- $(INSTALL) -d $(libdir)/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/data ++ $(INSTALL) -d $(DESTDIR)$(libdir)/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/data + $(INSTALL_DATA) bless-about.png bless-48x48.png bless-default.layout \ + bless-16-bytes-per-row.layout bless-all-number-bases.layout \ + default-preferences.xml \ +- $(libdir)/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/data +- $(INSTALL) -d $(datadir)/applications +- $(INSTALL_DATA) bless.desktop $(datadir)/applications +- $(INSTALL) -d $(datadir)/pixmaps +- $(INSTALL_DATA) bless-48x48.png $(datadir)/pixmaps +- $(INSTALL_SCRIPT) help_script.sh.install $(libdir)/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/data/help_script.sh ++ $(DESTDIR)$(libdir)/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/data ++ $(INSTALL) -d $(DESTDIR)$(datadir)/applications ++ $(INSTALL_DATA) bless.desktop $(DESTDIR)$(datadir)/applications ++ $(INSTALL) -d $(DESTDIR)$(datadir)/pixmaps ++ $(INSTALL_DATA) bless-48x48.png $(DESTDIR)$(datadir)/pixmaps ++ $(INSTALL_SCRIPT) help_script.sh.install $(DESTDIR)$(libdir)/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/data/help_script.sh + + uninstall-local: + rm -rf $(libdir)/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/data +--- bless-0.4.0/Makefile.am.orig 2006-02-05 17:25:20.000000000 +0100 ++++ bless-0.4.0/Makefile.am 2006-02-05 17:25:45.000000000 +0100 +@@ -16,8 +16,7 @@ + tla changelog > $(distdir)/ChangeLog + + install-data-local: +- $(INSTALL) -d $(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION) +- $(INSTALL_DATA) AUTHORS COPYING INSTALL ChangeLog NEWS README README.packaging bless.spec $(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION) ++ $(INSTALL) -d $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION) + + uninstall-local: + rm -rf $(libdir)/$(PACKAGE_NAME)-$(PACKAGE_VERSION) +--- bless-0.4.0/doc/user/Makefile.am.orig 2006-02-05 18:22:44.000000000 +0100 ++++ bless-0.4.0/doc/user/Makefile.am 2006-02-05 18:24:51.000000000 +0100 +@@ -10,7 +10,7 @@ + + $(OMF): $(OMF).in + if [ -x `which scrollkeeper-preinstall` ]; then \ +- scrollkeeper-preinstall file:$(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/user/bless-manual.xml $(OMF).in $(OMF); \ ++ scrollkeeper-preinstall file:$(datadir)/gnome/help/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/C/bless-manual.xml $(OMF).in $(OMF); \ + else \ + cp $(OMF).in $(OMF); \ + fi +@@ -22,10 +22,10 @@ + cp --parents $(DOCS) $(OMF).in $(wildcard *.html) $(FIGURES) $(distdir) + + install-data-local: +- $(INSTALL) -d $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/user +- $(INSTALL) -d $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/user/figures +- $(INSTALL_DATA) $(DOCS) $(wildcard *.html) $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/user +- $(INSTALL_DATA) $(FIGURES) $(DESTDIR)$(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/user/figures ++ $(INSTALL) -d $(DESTDIR)$(datadir)/gnome/help/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/C ++ $(INSTALL) -d $(DESTDIR)$(datadir)/gnome/help/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/C/figures ++ $(INSTALL_DATA) $(DOCS) $(wildcard *.html) $(DESTDIR)$(datadir)/gnome/help/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/C ++ $(INSTALL_DATA) $(FIGURES) $(DESTDIR)$(datadir)/gnome/help/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/C/figures + $(INSTALL) -d $(DESTDIR)$(datadir)/omf/$(PACKAGE_NAME) + $(INSTALL_DATA) $(OMF) $(DESTDIR)$(datadir)/omf/$(PACKAGE_NAME) + if WITH_SCROLLKEEPER +--- bless-0.4.0/data/Makefile.am.orig 2006-02-05 18:34:02.000000000 +0100 ++++ bless-0.4.0/data/Makefile.am 2006-02-05 18:34:24.000000000 +0100 +@@ -12,7 +12,7 @@ + help_script.sh: help_script.tmpl + sed -e 's,@blessdocdir\@,$(PWD)/../doc,g' help_script.tmpl > help_script.sh + chmod +x help_script.sh +- sed -e 's,@blessdocdir\@,$(datadir)/doc/$(PACKAGE_NAME)-$(PACKAGE_VERSION),g' help_script.tmpl > help_script.sh.install ++ sed -e 's,@blessdocdir\@,$(datadir)/gnome/help/$(PACKAGE_NAME)-$(PACKAGE_VERSION),g' help_script.tmpl > help_script.sh.install + + install-data-local: + $(INSTALL) -d $(DESTDIR)$(libdir)/$(PACKAGE_NAME)-$(PACKAGE_VERSION)/data +--- bless-0.4.0/data/help_script.tmpl.in.orig 2006-02-05 18:32:22.000000000 +0100 ++++ bless-0.4.0/data/help_script.tmpl.in 2006-02-05 18:32:42.000000000 +0100 +@@ -1,8 +1,8 @@ + #!@SHELL@ + + # Script that loads help for Bless +-xml_help="@blessdocdir@/user/bless-manual.xml" +-html_help="@blessdocdir@/user/index.html" ++xml_help="@blessdocdir@/C/bless-manual.xml" ++html_help="@blessdocdir@/C/index.html" + + # try to get default browsers from GConf + GCONFTOOL=`which gconftool-2 2> /dev/null` diff --git a/bless-help.patch b/bless-help.patch new file mode 100644 index 0000000..6c8ca80 --- /dev/null +++ b/bless-help.patch @@ -0,0 +1,11 @@ +--- bless-0.4.0/src/gui/MainWindow.cs.orig 2006-02-05 17:43:42.000000000 +0100 ++++ bless-0.4.0/src/gui/MainWindow.cs 2006-02-05 17:46:26.000000000 +0100 +@@ -1605,7 +1605,7 @@ + public void OnHelpContents(object o, EventArgs args) + { + #if ENABLE_UNIX_SPECIFIC +- string helpScript=FileResourcePath.GetPath("..", "data", "help_script.sh"); ++ string helpScript=FileResourcePath.GetPath("..", "bin", "help_script.sh"); + System.Diagnostics.Process.Start(helpScript); + #endif + } diff --git a/bless.spec b/bless.spec index d1fee20..561fa06 100644 --- a/bless.spec +++ b/bless.spec @@ -1,17 +1,18 @@ Summary: Hex Editor written in GTK# Summary(pl): Edytor szesnastkowy napisany w GTK# Name: bless -Version: 0.3.1 +Version: 0.4.0 Release: 1 License: GPL Group: Applications/Editors Source0: http://download.gna.org/bless/%{name}-%{version}.tar.gz -# Source0-md5: 91597bacbffbd24b3ff5b19de60f7a08 +# Source0-md5: e161996a67155303d9e6a04fa28662ca Source1: %{name}.desktop Patch0: %{name}-DESTDIR.patch +Patch1: %{name}-help.patch URL: http://home.gna.org/bless/ -BuildRequires: dotnet-gtk-sharp-devel >= 1.0 -BuildRequires: mono-csharp >= 1.0 +BuildRequires: dotnet-gtk-sharp2-devel >= 1.9.5 +BuildRequires: mono-csharp >= 1.1.4 BuildRequires: mono-devel >= 1.0 BuildRequires: pkgconfig BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) @@ -26,9 +27,15 @@ Bless stara si %prep %setup -q %patch0 -p1 +%patch1 -p1 %build -%configure +%{__libtoolize} +%{__aclocal} +%{__autoconf} +%{__automake} +%configure \ + --without-scrollkeeper %{__make} %install @@ -39,14 +46,28 @@ install -d $RPM_BUILD_ROOT%{_desktopdir} DESTDIR=$RPM_BUILD_ROOT install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir} +mv $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/data/help_script.sh $RPM_BUILD_ROOT%{_libdir}/%{name}-%{version}/bin + +%find_lang %{name} --all-name --with-gnome %clean rm -rf $RPM_BUILD_ROOT -%files +%post +%scrollkeeper_update_post +%update_desktop_database_post + +%postun +%scrollkeeper_update_postun +%update_desktop_database_postun + +%files -f %{name}.lang %defattr(644,root,root,755) -%doc AUTHORS Changelog NEWS README doc/user +%doc AUTHORS ChangeLog NEWS README %attr(755,root,root) %{_bindir}/* -%dir %{_libdir}/%{name} -%attr(755,root,root) %{_libdir}/%{name}/*.exe +%dir %{_libdir}/%{name}-%{version} +%{_libdir}/%{name}-%{version}/data +%attr(755,root,root) %{_libdir}/%{name}-%{version}/bin/* %{_desktopdir}/* +%{_omf_dest_dir}/%{name} +%{_pixmapsdir}/* -- 2.43.0