diff --git a/libmowgli-2.0.0.g185.tar.xz b/libmowgli-2.0.0.g185.tar.xz new file mode 100644 index 0000000..9ca1970 --- /dev/null +++ b/libmowgli-2.0.0.g185.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9fa1705ca85cbab29fe562673c8c7ece171a49ca16bee7bfbb4aad8cc7432152 +size 181804 diff --git a/libmowgli-2.0.0.tar.xz b/libmowgli-2.0.0.tar.xz deleted file mode 100644 index 78499d7..0000000 --- a/libmowgli-2.0.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b5ce2a24fef5fca45faf47f3b36b3ba5ed4158e6565c78468da572f7bca7cf4f -size 156704 diff --git a/libmowgli2.changes b/libmowgli2.changes index cfa2018..923bf34 100644 --- a/libmowgli2.changes +++ b/libmowgli2.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Sun Jul 20 11:22:14 UTC 2014 - jengelh@inai.de + +- Update to snapshot 2.0.0.g185 required by atheme-services-7.1.0 +* Added a strndup implementation +* Add method to set SO_REUSEADDR on vio sockets +* eventloop: rename mowgli_eventloop_timer_t.when to + mowgli_eventloop_timer_t.deadline + ------------------------------------------------------------------- Mon Mar 3 21:46:30 UTC 2014 - jengelh@inai.de diff --git a/libmowgli2.spec b/libmowgli2.spec index 69d677c..9227ad6 100644 --- a/libmowgli2.spec +++ b/libmowgli2.spec @@ -21,12 +21,13 @@ Name: libmowgli2 Summary: A development framework for C (like GLib) License: ISC Group: Development/Libraries/C and C++ -Version: 2.0.0 +Version: 2.0.0.g185 Release: 0 Url: http://atheme.org/projects/libmowgli.html -#Git-Clone: git://github.com/atheme/libmowgli-2 #DL-URL: http://atheme.org/downloads/libmowgli-2.0.0.tar.gz +#Git-Clone: git://github.com/atheme/libmowgli-2 +#Snapshot: libmowgli-2.0.0-185-g7790ffd Source: libmowgli-%version.tar.xz Patch1: platform.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -75,7 +76,7 @@ block allocator. This package holds the development files for libmowgli v2. %prep -%setup -qn libmowgli-%version +%setup -qn libmowgli-2 %patch -P 1 -p1 %build @@ -83,6 +84,7 @@ if [ ! -e configure ]; then ./autogen.sh; fi; %configure +perl -i -pe 's{2\.0\.0}{%version}' *.pc make %{?_smp_mflags} %install diff --git a/platform.patch b/platform.patch index 5bada4b..dc291be 100644 --- a/platform.patch +++ b/platform.patch @@ -1,16 +1,20 @@ From: Andreas Schwab Date: Sun, 3 Mar 2013 20:19:46 +0000 -Index: libmowgli-2.0.0/src/libmowgli/platform/machine.h +--- + src/libmowgli/platform/machine.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +Index: libmowgli-2/src/libmowgli/platform/machine.h =================================================================== ---- libmowgli-2.0.0.orig/src/libmowgli/platform/machine.h -+++ libmowgli-2.0.0/src/libmowgli/platform/machine.h -@@ -180,7 +180,7 @@ - #if defined _LP64 || defined __LP64 - #define MOWGLI_CPU_BITS 64 - #define MOWGLI_CPU_BITS_64 --#elif -+#else - #define MOWGLI_CPU_BITS 32 - #define MOWGLI_CPU_BITS_32 - #endif +--- libmowgli-2.orig/src/libmowgli/platform/machine.h ++++ libmowgli-2/src/libmowgli/platform/machine.h +@@ -186,7 +186,7 @@ + # if defined _LP64 || defined __LP64 + # define MOWGLI_CPU_BITS 64 + # define MOWGLI_CPU_BITS_64 +-# elif ++# else + # define MOWGLI_CPU_BITS 32 + # define MOWGLI_CPU_BITS_32 + # endif