From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Mon, 24 Oct 2011 11:53:19 +0000 (+0200)
Subject: Merge branch 'bugfixes' of git://github.com/dirkhh/subsurface
X-Git-Url: http://git.tdb.fi/?a=commitdiff_plain;h=7783387b978e5c13a415d0076ab9ff8e1c45bf4c;hp=bd275d73ac06823619230915a3aa29deddc996fb;p=ext%2Fsubsurface.git

Merge branch 'bugfixes' of git://github.com/dirkhh/subsurface

* 'bugfixes' of git://github.com/dirkhh/subsurface:
  Updated changes file
  Create packaging directory and add spec and changes file
  Makefile fixes
---

diff --git a/Makefile b/Makefile
index 972c232..4be5991 100644
--- a/Makefile
+++ b/Makefile
@@ -24,17 +24,27 @@ MANFILES = $(NAME).1
 # libdivecomputer still is - so we check /usr/local and /usr and then we
 # give up. You can override by simply setting it here
 #
-libdc-local := $(wildcard /usr/local/include/libdivecomputer/*)
-libdc-usr := $(wildcard /usr/include/libdivecomputer/*)
+libdc-local := $(wildcard /usr/local/lib/libdivecomputer.a)
+libdc-local64 := $(wildcard /usr/local/lib64/libdivecomputer.a)
+libdc-usr := $(wildcard /usr/lib/libdivecomputer.a)
+libdc-usr64 := $(wildcard /usr/lib64/libdivecomputer.a)
 
 ifneq ($(strip $(libdc-local)),)
 	LIBDIVECOMPUTERDIR = /usr/local
 	LIBDIVECOMPUTERINCLUDES = $(LIBDIVECOMPUTERDIR)/include/libdivecomputer
 	LIBDIVECOMPUTERARCHIVE = $(LIBDIVECOMPUTERDIR)/lib/libdivecomputer.a
+else ifneq ($(strip $(libdc-local64)),)
+	LIBDIVECOMPUTERDIR = /usr/local
+	LIBDIVECOMPUTERINCLUDES = $(LIBDIVECOMPUTERDIR)/include/libdivecomputer
+	LIBDIVECOMPUTERARCHIVE = $(LIBDIVECOMPUTERDIR)/lib64/libdivecomputer.a
 else ifneq ($(strip $(libdc-usr)),)
 	LIBDIVECOMPUTERDIR = /usr
 	LIBDIVECOMPUTERINCLUDES = $(LIBDIVECOMPUTERDIR)/include/libdivecomputer
 	LIBDIVECOMPUTERARCHIVE = $(LIBDIVECOMPUTERDIR)/lib/libdivecomputer.a
+else ifneq ($(strip $(libdc-usr64)),)
+	LIBDIVECOMPUTERDIR = /usr
+	LIBDIVECOMPUTERINCLUDES = $(LIBDIVECOMPUTERDIR)/include/libdivecomputer
+	LIBDIVECOMPUTERARCHIVE = $(LIBDIVECOMPUTERDIR)/lib64/libdivecomputer.a
 else
 $(error Cannot find libdivecomputer - please edit Makefile)
 endif
@@ -67,8 +77,8 @@ install: $(NAME)
 	$(INSTALL) -d -m 755 $(ICONDIR)
 	$(INSTALL) $(ICONFILE) $(ICONDIR)
 	$(gtk_update_icon_cache)
-	$(INSTALL) -d -m 644 $(MANDIR)
-	$(INSTALL) $(MANFILES) $(MANDIR)
+	$(INSTALL) -d -m 755 $(MANDIR)
+	$(INSTALL) -m 644 $(MANFILES) $(MANDIR)
 
 parse-xml.o: parse-xml.c dive.h
 	$(CC) $(CFLAGS) `pkg-config --cflags glib-2.0` -c `xml2-config --cflags`  parse-xml.c
diff --git a/packaging/subsurface.changes b/packaging/subsurface.changes
new file mode 100644
index 0000000..1146643
--- /dev/null
+++ b/packaging/subsurface.changes
@@ -0,0 +1,29 @@
+-------------------------------------------------------------------
+Mon Oct 24 04:22:35 PDT 2011 - Dirk Hohndel <dirk@hohndel.org> 1.1-5
+
+- apply the patches upstream and now start maintaining the spec file
+  and changelog in the subsurface git
+
+-------------------------------------------------------------------
+Mon Oct 24 02:12:27 PDT 2011 - Dirk Hohndel <dirk@hohndel.org> 1.1-4
+
+- upgrade to subsurface 1.1
+
+-------------------------------------------------------------------
+Wed Oct 12 10:26:59 PDT 2011 - Dirk Hohndel <dirk@hohndel.org> 1.0-3
+
+- beat desktop file and other install issues into submission
+
+-------------------------------------------------------------------
+Tue Oct 11 21:21:10 PDT 2011 - Dirk Hohndel <dirk@hohndel.org> 1.0-2
+
+- update to newer version that brings Makefile changes and
+  desktop integration
+
+--------------------------------------------------------------------
+Sun Oct  9 21:53:28 PDT 2011 - Dirk Hohndel <dirk@hohndel.org> 1.0-1
+
+- create spec file for subsurface
+
+
+
diff --git a/packaging/subsurface.spec b/packaging/subsurface.spec
new file mode 100644
index 0000000..53b96bc
--- /dev/null
+++ b/packaging/subsurface.spec
@@ -0,0 +1,44 @@
+Name: 		subsurface
+Summary: 	Simple Dive Log Program
+Version: 	1.1
+Release:    	5
+License:	GPLv2
+URL:		http://subsurface.hohndel.org
+Source0:        subsurface-1.1.tar.gz
+BuildRequires:  pkgconfig gtk2-devel glib2-devel libxml2-devel libdivecomputer0-devel 
+%if 0%{?suse_version}
+BuildRequires:  gconf2-devel update-desktop-files
+%else
+BuildRequires:  GConf2-devel
+%endif
+
+Group:		Productivity/Other
+
+%description
+subsurface is a simple dive log program written in C
+
+%prep
+%setup -q
+
+%build
+make
+
+%clean
+rm -rf %{buildroot}
+
+%install
+make install prefix=%buildroot/usr
+%if 0%{?suse_version}
+%suse_update_desktop_file -r %{name} Utility SyncUtility 
+%endif
+rm %{buildroot}/%{_datadir}/icons/hicolor/icon-theme.cache
+
+%files 
+%defattr(-,root,root)
+%{_bindir}/subsurface
+%{_datadir}/applications/subsurface.desktop
+%{_datadir}/icons/hicolor/scalable/apps/subsurface.svg
+%{_datadir}/man/man1/subsurface.1.gz
+
+
+%changelog