- updated to 2.4.1 (last version named as clinkc from mupnp repository)

- updated libtool,iconv patches
- added version patch (fix project version)

diff --git a/clinkc-iconv.patch b/clinkc-iconv.patch
index f04e3179aab264e037d53d0b36dbe627fe2530f7..20a90d80cc8b71b6e7c90069a38b1d256c66d7c0 100644 (file)
--- a/clinkc-iconv.patch
+++ b/clinkc-iconv.patch
@@ -1,5 +1,5 @@
---- clinkc/configure.in.orig   2021-03-04 20:48:30.769948133 +0100
-+++ clinkc/configure.in        2021-03-04 20:57:39.143644005 +0100
+--- clinkc/configure.ac.orig   2021-03-04 20:48:30.769948133 +0100
++++ clinkc/configure.ac        2021-03-04 20:57:39.143644005 +0100
 @@ -393,7 +393,7 @@
  
  AC_CHECK_FUNCS([iconv])

diff --git a/clinkc-libtool.patch b/clinkc-libtool.patch
index 13550bfac47393381d2be2ae269bd66feb537e6a..772e0941bc13d9a65681c42b8c76fbaeb073b55a 100644 (file)
--- a/clinkc-libtool.patch
+++ b/clinkc-libtool.patch
@@ -1,8 +1,8 @@
---- clinkc/configure.in.orig   2010-08-17 14:15:44.000000000 +0200
-+++ clinkc/configure.in        2021-03-04 20:48:30.769948133 +0100
+--- clinkc/configure.ac.orig   2010-08-17 14:15:44.000000000 +0200
++++ clinkc/configure.ac        2021-03-04 20:48:30.769948133 +0100
 @@ -62,7 +62,7 @@
  AC_PROG_CC
-+AC_LANG_CPLUSPLUS
++AC_PROG_CXX
  AC_PROG_INSTALL
  AC_PROG_AWK
 -#AC_PROG_LIBTOOL
@@ -10,9 +10,12 @@
  AC_PROG_RANLIB
 -AC_LANG_CPLUSPLUS
  AM_PROG_CC_C_O
---- clinkc/lib/unix/Makefile.am.orig   2010-02-02 15:50:42.000000000 +0100
-+++ clinkc/lib/unix/Makefile.am        2021-03-04 20:51:45.318894171 +0100
-@@ -1,8 +1,8 @@
+--- mupnp-2.4.1/lib/unix/Makefile.am.orig      2021-03-06 21:09:35.550291646 +0100
++++ mupnp-2.4.1/lib/unix/Makefile.am   2021-03-06 21:12:24.766041592 +0100
+@@ -6,11 +6,11 @@
+ #
+ ############################################################
+ 
 -#if HAVE_LIBTOOL
 -#lib_LTLIBRARIES = libclinkc.la
 -#else
@@ -23,11 +26,11 @@
 -#endif
 +endif
  
- INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/include @XML_CFLAGS@ @HTTP_CFLAGS@ @CLOG_DEBUG_FLAGS@
+ AM_CFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include @XML_CFLAGS@ @HTTP_CFLAGS@ @CLOG_DEBUG_FLAGS@
  
-@@ -112,13 +112,13 @@
+@@ -115,13 +115,13 @@
  nobase_libclinkcinclude_HEADERS =  \
-         $(clinkc_header)
+         $(clinkc_headers)
  
 -#if HAVE_LIBTOOL
 -#libclinkc_la_SOURCES = \
@@ -36,17 +39,18 @@
 -#else
 +if HAVE_LIBTOOL
 +libclinkc_la_SOURCES = \
-+        $(clinkc_source)
++        $(clinkc_sources)
 +libclinkc_la_LIBADD = @HTTP_LIBS@ @XML_LIBS@
 +else
  libclinkc_a_SOURCES = \
-         $(clinkc_source)
+         $(clinkc_sources)
  libclinkc_a_CFLAGS = $(AM_CFLAGS)
- libclinkc_a_LIBADD = @HTTP_LIBS@ @XML_LIBS@
+-#libclinkc_a_LIBADD = @HTTP_LIBS@ @XML_LIBS@
 -#endif
++libclinkc_a_LIBADD = @HTTP_LIBS@ @XML_LIBS@
 +endif
---- clinkc/sample/clock/unix/Makefile.am.orig  2010-02-02 15:50:42.000000000 +0100
-+++ clinkc/sample/clock/unix/Makefile.am       2021-03-04 20:52:39.021936570 +0100
+--- clinkc/examples/clock/unix/Makefile.am.orig        2010-02-02 15:50:42.000000000 +0100
++++ clinkc/examples/clock/unix/Makefile.am     2021-03-04 20:52:39.021936570 +0100
 @@ -15,8 +15,8 @@
        ../clock_device.c \
        ../../common/kb_util.c
@@ -60,8 +64,8 @@
  upnpclock_LDADD = ../../../lib/unix/libclinkc.a @XML_LIBS@
 -#endif
 +endif
---- clinkc/sample/upnpavdump/unix/Makefile.am.orig     2010-02-02 15:50:42.000000000 +0100
-+++ clinkc/sample/upnpavdump/unix/Makefile.am  2021-03-04 20:53:00.541819987 +0100
+--- clinkc/examples/upnpavdump/unix/Makefile.am.orig   2010-02-02 15:50:42.000000000 +0100
++++ clinkc/examples/upnpavdump/unix/Makefile.am        2021-03-04 20:53:00.541819987 +0100
 @@ -11,8 +11,8 @@
        ../upnpavdump.c \
        ../../common/kb_util.c
@@ -75,8 +79,8 @@
  upnpavdump_LDADD = ../../../lib/unix/libclinkc.a @XML_LIBS@
 -#endif
 +endif
---- clinkc/sample/upnpdump/unix/Makefile.am.orig       2010-02-02 15:50:42.000000000 +0100
-+++ clinkc/sample/upnpdump/unix/Makefile.am    2021-03-04 20:53:21.415040240 +0100
+--- clinkc/examples/upnpdump/unix/Makefile.am.orig     2010-02-02 15:50:42.000000000 +0100
++++ clinkc/examples/upnpdump/unix/Makefile.am  2021-03-04 20:53:21.415040240 +0100
 @@ -11,8 +11,8 @@
        ../upnpdump.c \
        ../../common/kb_util.c
@@ -90,8 +94,8 @@
  upnpdump_LDADD = ../../../lib/unix/libclinkc.a @XML_LIBS@
 -#endif
 +endif
---- clinkc/sample/upnpigddump/unix/Makefile.am.orig    2010-02-02 15:50:42.000000000 +0100
-+++ clinkc/sample/upnpigddump/unix/Makefile.am 2021-03-04 20:53:36.471625339 +0100
+--- clinkc/examples/upnpigddump/unix/Makefile.am.orig  2010-02-02 15:50:42.000000000 +0100
++++ clinkc/examples/upnpigddump/unix/Makefile.am       2021-03-04 20:53:36.471625339 +0100
 @@ -11,8 +11,8 @@
        ../upnpigddump.c \
        ../../common/kb_util.c

diff --git a/clinkc-version.patch b/clinkc-version.patch
new file mode 100644 (file)
index 0000000..71c3663
--- /dev/null
+++ b/clinkc-version.patch
@@ -0,0 +1,11 @@
+--- mupnp-2.4.1/configure.ac.orig      2021-03-07 13:08:32.679134657 +0100
++++ mupnp-2.4.1/configure.ac   2021-03-07 13:18:48.275799684 +0100
+@@ -9,7 +9,7 @@
+ AC_CONFIG_AUX_DIR(config)
+ AM_CONFIG_HEADER(config.h)
+ 
+-AC_INIT([clinkc], [3.0])
++AC_INIT([clinkc], [2.4.1])
+ AC_CONFIG_SRCDIR([include/cybergarage/typedef.h])
+ AM_INIT_AUTOMAKE([subdir-objects])
+ 

diff --git a/clinkc.spec b/clinkc.spec
index 84b05ceb98f047b4a771655c49992c4298350440..d3e1f7af0b2fa24fdff436b8d2f5ee0399245ba3 100644 (file)
--- a/clinkc.spec
+++ b/clinkc.spec
@@ -1,3 +1,4 @@
+# note: for versions >= 3 (with changed library name) see mupnp.spec
 #
 # Conditional build:
 %bcond_without static_libs     # static library
@@ -6,16 +7,18 @@
 Summary:       CyberLink for C UPnP library
 Summary(pl.UTF-8):     Biblioteka UPnP CyberLink dla C
 Name:          clinkc
-Version:       2.4.0
-%define        fver    %(echo %{version} | tr -d .)
+# keep 2.x here for libclinkc name
+Version:       2.4.1
 Release:       1
 License:       BSD
 Group:         Libraries
-Source0:       https://downloads.sourceforge.net/clinkc/%{name}%{fver}.tar.gz
-# Source0-md5: d548ead428419b0e2e521f06cd7b2ddb
+#Source0Download: https://github.com/cybergarage/mupnp/releases
+Source0:       https://github.com/cybergarage/mupnp/archive/%{version}/%{name}-%{version}.tar.gz
+# Source0-md5: 622ba12704305091dbc5978d5a0a49df
 Patch0:                %{name}-libtool.patch
 Patch1:                %{name}-iconv.patch
 Patch2:                %{name}-doc.patch
+Patch3:                %{name}-version.patch
 URL:           https://sourceforge.net/projects/clinkc/
 BuildRequires: autoconf
 BuildRequires: automake
@@ -78,10 +81,11 @@ API documentation for clinkc library.
 Dokumentacja API biblioteki clinkc.
 
 %prep
-%setup -q -n %{name}
+%setup -q -n mupnp-%{version}
 %patch0 -p1
 %patch1 -p1
 %patch2 -p1
+%patch3 -p1
 
 %build
 %{__libtoolize}
@@ -102,7 +106,7 @@ rm -rf $RPM_BUILD_ROOT
 # obsoleted by pkg-config
 %{__rm} $RPM_BUILD_ROOT%{_libdir}/libclinkc.la
 # compiled binaries
-%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/clinkc-2.3
+%{__rm} -r $RPM_BUILD_ROOT%{_docdir}/clinkc-%{version}/samples
 # packaged as %doc
 %{__rm} -r $RPM_BUILD_ROOT%{_docdir}/{clinkc-dev,clinkc0}