From 16461e93289f85f7b46f64973a5ed8e9a9040189 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Mon, 24 Oct 2011 04:12:44 -0700 Subject: Makefile fixes The stupid lib vs lib64 problem. I'm sure there's a more portable way to handle this, but this at least seems to work. Also fix the install target. Seriously, you create a directory with mode 644 and claim that this ever worked? Signed-off-by: Dirk Hohndel --- Makefile | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index e946469bb..2d86d4890 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 -- cgit v1.2.3-70-g09d2 From 47ba2ace28859872fa116aecc31beb56f548d469 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Mon, 24 Oct 2011 04:26:17 -0700 Subject: Create packaging directory and add spec and changes file These work for me on OBS Signed-off-by: Dirk Hohndel --- packaging/subsurface.changes | 23 +++++++++++++++++++++++ packaging/subsurface.spec | 44 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 67 insertions(+) create mode 100644 packaging/subsurface.changes create mode 100644 packaging/subsurface.spec diff --git a/packaging/subsurface.changes b/packaging/subsurface.changes new file mode 100644 index 000000000..235bfb9d8 --- /dev/null +++ b/packaging/subsurface.changes @@ -0,0 +1,23 @@ +------------------------------------------------------------------- +Mon Oct 24 02:12:27 PDT 2011 - Dirk Hohndel 1.1-4 + +- upgrade to subsurface 1.1 + +------------------------------------------------------------------- +Wed Oct 12 10:26:59 PDT 2011 - Dirk Hohndel 1.0-3 + +- beat desktop file and other install issues into submission + +------------------------------------------------------------------- +Tue Oct 11 21:21:10 PDT 2011 - Dirk Hohndel 1.0-2 + +- update to newer version that brings Makefile changes and + desktop integration + +-------------------------------------------------------------------- +Sun Oct 9 21:53:28 PDT 2011 - Dirk Hohndel 1.0-1 + +- create spec file for subsurface + + + diff --git a/packaging/subsurface.spec b/packaging/subsurface.spec new file mode 100644 index 000000000..53b96bc0b --- /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 -- cgit v1.2.3-70-g09d2 From 4cf4b9ca28a7a8918bec6198c51af97f96712ba6 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Mon, 24 Oct 2011 04:34:59 -0700 Subject: Updated changes file Turns out that I forgot the -a in the last commit. Sorry Signed-off-by: Dirk Hohndel --- packaging/subsurface.changes | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/packaging/subsurface.changes b/packaging/subsurface.changes index 235bfb9d8..114664378 100644 --- a/packaging/subsurface.changes +++ b/packaging/subsurface.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Oct 24 04:22:35 PDT 2011 - Dirk Hohndel 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 1.1-4 -- cgit v1.2.3-70-g09d2