From 9df689733ef10c4d0be7ed6236f1aaa72f44fa5f Mon Sep 17 00:00:00 2001
From: Christian Dersch <lupinix@mailbox.org>
Date: Nov 17 2017 22:46:12 +0000
Subject: rebased astrometry-Add-SONAME-to-libastrometry.so.patch, take 2


---

diff --git a/astrometry-0.73-Add-SONAME-to-libastrometry.so.patch b/astrometry-0.73-Add-SONAME-to-libastrometry.so.patch
new file mode 100644
index 0000000..59dd97d
--- /dev/null
+++ b/astrometry-0.73-Add-SONAME-to-libastrometry.so.patch
@@ -0,0 +1,24 @@
+diff -Naur astrometry/blind/Makefile astrometry.new/blind/Makefile
+--- astrometry/blind/Makefile	2017-11-17 23:41:01.749922420 +0100
++++ astrometry.new/blind/Makefile	2017-11-17 23:44:09.742825751 +0100
+@@ -147,7 +147,8 @@
+ 	$(RANLIB) $@
+ 
+ $(ENGINE_SO): $(ENGINE_OBJS) $(SLIB)
+-	$(CC) $(LDFLAGS) $(SHAREDLIBFLAGS) -o $@ $^ $(LDLIBS)
++	$(CC) $(LDFLAGS) $(SHAREDLIBFLAGS) -Wl,-soname,$@.0 -o $@.0 $^ $(LDLIBS)
++	ln -s  $@.0 $@
+ 
+ # old and miscellaneous executables that aren't part of the pipeline.
+ OLDEXECS := plotquads rawstartree checkquads
+@@ -232,8 +233,8 @@
+ 	done
+ 	$(MKDIR) '$(LIB_INSTALL_DIR)'
+ 	@for x in $(INSTALL_LIB); do \
+-		echo $(CP) $$x '$(LIB_INSTALL_DIR)'; \
+-		$(CP) $$x '$(LIB_INSTALL_DIR)'; \
++		echo $(CP) -d $$x* '$(LIB_INSTALL_DIR)'; \
++		$(CP) -d $$x* '$(LIB_INSTALL_DIR)'; \
+ 	done
+ 	$(MKDIR) '$(PY_INSTALL_DIR)'
+ 	@for x in $(PYTHON_INSTALL); do \
diff --git a/astrometry-Add-SONAME-to-libastrometry.so.patch b/astrometry-Add-SONAME-to-libastrometry.so.patch
deleted file mode 100644
index 945b081..0000000
--- a/astrometry-Add-SONAME-to-libastrometry.so.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From: Ole Streicher <olebole@debian.org>
-Date: Thu, 1 Dec 2016 21:18:56 +0100
-Subject: Add SONAME to libastrometry.so
-
----
- blind/Makefile | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/blind/Makefile b/blind/Makefile
-index 59809ba..1d55c9c 100644
---- a/blind/Makefile
-+++ b/blind/Makefile
-@@ -147,7 +147,8 @@ $(ENGINE_LIB): $(ENGINE_OBJS)
- 	$(RANLIB) $@
- 
- $(ENGINE_SO): $(ENGINE_OBJS) $(SLIB)
--	$(CC) $(LDFLAGS) $(SHAREDLIBFLAGS) -o $@ $^ $(LDLIBS)
-+	$(CC) $(LDFLAGS) $(SHAREDLIBFLAGS) -Wl,-soname,$@.0 -o $@.0 $^ $(LDLIBS)
-+	ln -s  $@.0 $@
- 
- # old and miscellaneous executables that aren't part of the pipeline.
- OLDEXECS := plotquads rawstartree checkquads
-@@ -232,8 +233,8 @@ install: $(INSTALL_EXECS) $(INSTALL_LIB)
- 	done
- 	mkdir -p '$(LIB_INSTALL_DIR)'
- 	@for x in $(INSTALL_LIB); do \
--		echo $(CP) $$x '$(LIB_INSTALL_DIR)'; \
--		$(CP) $$x '$(LIB_INSTALL_DIR)'; \
-+		echo $(CP) -d $$x* '$(LIB_INSTALL_DIR)'; \
-+		$(CP) -d $$x* '$(LIB_INSTALL_DIR)'; \
- 	done
- 	mkdir -p '$(PY_INSTALL_DIR)'
- 	@for x in $(PYTHON_INSTALL); do \
diff --git a/astrometry.spec b/astrometry.spec
index e901e11..c83d505 100644
--- a/astrometry.spec
+++ b/astrometry.spec
@@ -61,7 +61,7 @@ Source7:        astrometry-get-data.sh
 #  * have a proper versioned soname
 #  * use system libraries properly
 #  * use dynamical linking
-Patch0:         %{name}-Add-SONAME-to-libastrometry.so.patch
+Patch0:         %{name}-0.73-Add-SONAME-to-libastrometry.so.patch
 Patch1:         %{name}-Dynamically-link-to-libastrometry.so-when-possible.patch
 Patch2:         %{name}-Fix-issues-when-using-Debian-libs-instead-of-convienience.patch
 Patch3:         %{name}-Call-python-scripts-as-modules-instead-of-executables.patch