# HG changeset patch # User Michael Schloh von Bennewitz # Date 1346173330 -7200 # Node ID 804f172af1626d92797efa2c8c6462654ff649c4 # Parent 08b1736686fa9b20643a3e7d0288eaf0cd2e25ff Update version, adjust patch code accordingly, and modernize packaging. diff -r 08b1736686fa -r 804f172af162 libupnp/libupnp.patch --- a/libupnp/libupnp.patch Tue Aug 28 19:02:05 2012 +0200 +++ b/libupnp/libupnp.patch Tue Aug 28 19:02:10 2012 +0200 @@ -1,48 +1,48 @@ -Index: upnp/sample/tvctrlpt/linux/upnp_tv_ctrlpt_main.c -diff -Nau upnp/sample/tvctrlpt/linux/upnp_tv_ctrlpt_main.c.orig upnp/sample/tvctrlpt/linux/upnp_tv_ctrlpt_main.c ---- upnp/sample/tvctrlpt/linux/upnp_tv_ctrlpt_main.c.orig 2008-03-22 17:48:13.000000000 +0100 -+++ upnp/sample/tvctrlpt/linux/upnp_tv_ctrlpt_main.c 2009-01-12 16:05:10.847325711 +0100 -@@ -429,7 +429,11 @@ - */ - sigemptyset( &sigs_to_catch ); - sigaddset( &sigs_to_catch, SIGINT ); +Index: upnp/sample/linux/tv_ctrlpt_main.c +diff -Nau upnp/sample/linux/tv_ctrlpt_main.c.orig upnp/sample/linux/tv_ctrlpt_main.c +--- upnp/sample/linux/tv_ctrlpt_main.c.orig 2008-03-22 17:48:13.000000000 +0100 ++++ upnp/sample/linux/tv_ctrlpt_main.c 2009-01-12 16:05:10.847325711 +0100 +@@ -60,7 +60,11 @@ + /* Catch Ctrl-C and properly shutdown */ + sigemptyset(&sigs_to_catch); + sigaddset(&sigs_to_catch, SIGINT); +#if (defined(sun) && defined(__svr4__)) -+ sigwait( &sigs_to_catch ); ++ sigwait(&sigs_to_catch); +#else - sigwait( &sigs_to_catch, &sig ); + sigwait(&sigs_to_catch, &sig); +#endif - - SampleUtil_Print( "Shutting down on signal %d...", sig ); - #else -Index: upnp/sample/tvcombo/linux/upnp_tv_combo_main.c -diff -Nau upnp/sample/tvcombo/linux/upnp_tv_combo_main.c.orig upnp/sample/tvcombo/linux/upnp_tv_combo_main.c ---- upnp/sample/tvcombo/linux/upnp_tv_combo_main.c.orig 2009-01-12 16:12:00.406762331 +0100 -+++ upnp/sample/tvcombo/linux/upnp_tv_combo_main.c 2009-01-12 16:14:23.401611284 +0100 -@@ -477,7 +477,11 @@ - */ - sigemptyset( &sigs_to_catch ); - sigaddset( &sigs_to_catch, SIGINT ); + SampleUtil_Print("Shutting down on signal %d...\n", sig); + #endif + rc = TvCtrlPointStop(); +Index: upnp/sample/linux/tv_combo_main.c +diff -Nau upnp/sample/linux/tv_combo_main.c.orig upnp/sample/linux/tv_combo_main.c +--- upnp/sample/linux/tv_combo_main.c.orig 2009-01-12 16:12:00.406762331 +0100 ++++ upnp/sample/linux/tv_combo_main.c 2009-01-12 16:14:23.401611284 +0100 +@@ -61,7 +61,11 @@ + /* Catch Ctrl-C and properly shutdown */ + sigemptyset(&sigs_to_catch); + sigaddset(&sigs_to_catch, SIGINT); +#if (defined(sun) && defined(__svr4__)) -+ sigwait( &sigs_to_catch ); ++ sigwait(&sigs_to_catch); +#else - sigwait( &sigs_to_catch, &sig ); + sigwait(&sigs_to_catch, &sig); +#endif - - SampleUtil_Print( "Shutting down on signal %d...\n", sig ); - #else -Index: upnp/sample/tvdevice/linux/upnp_tv_device_main.c -diff -Nau upnp/sample/tvdevice/linux/upnp_tv_device_main.c.orig upnp/sample/tvdevice/linux/upnp_tv_device_main.c ---- upnp/sample/tvdevice/linux/upnp_tv_device_main.c.orig 2008-03-22 18:04:30.000000000 +0100 -+++ upnp/sample/tvdevice/linux/upnp_tv_device_main.c 2009-01-12 16:19:03.504059810 +0100 -@@ -184,7 +184,11 @@ - */ - sigemptyset( &sigs_to_catch ); - sigaddset( &sigs_to_catch, SIGINT ); + SampleUtil_Print("Shutting down on signal %d...\n", sig); + #endif + TvDeviceStop(); +Index: upnp/sample/linux/tv_device_main.c +diff -Nau upnp/sample/linux/tv_device_main.c.orig upnp/sample/linux/tv_device_main.c +--- upnp/sample/linux/tv_device_main.c.orig 2008-03-22 18:04:30.000000000 +0100 ++++ upnp/sample/linux/tv_device_main.c 2009-01-12 16:19:03.504059810 +0100 +@@ -59,7 +59,11 @@ + /* Catch Ctrl-C and properly shutdown */ + sigemptyset(&sigs_to_catch); + sigaddset(&sigs_to_catch, SIGINT); +#if (defined(sun) && defined(__svr4__)) -+ sigwait( &sigs_to_catch ); ++ sigwait(&sigs_to_catch); +#else - sigwait( &sigs_to_catch, &sig ); + sigwait(&sigs_to_catch, &sig); +#endif - - SampleUtil_Print( "Shutting down on signal %d...\n", sig ); - #else + SampleUtil_Print("Shutting down on signal %d...\n", sig); + #endif + rc = TvDeviceStop(); diff -r 08b1736686fa -r 804f172af162 libupnp/libupnp.spec --- a/libupnp/libupnp.spec Tue Aug 28 19:02:05 2012 +0200 +++ b/libupnp/libupnp.spec Tue Aug 28 19:02:10 2012 +0200 @@ -1,6 +1,6 @@ ## ## libupnp.spec -- OpenPKG RPM Specification -## Copyright (c) 2009 Michael Schloh von Bennewitz +## Copyright (c) 2012 Michael Schloh von Bennewitz ## ## Permission to use, copy, modify, and distribute this software for ## any purpose with or without fee is hereby granted, provided that @@ -32,20 +32,16 @@ Class: EVAL Group: Network License: BSD -Version: 1.6.6 -Release: 20090106 +Version: 1.6.17 +Release: 20120800 # list of sources Source0: http://switch.dl.sourceforge.net/pupnp/libupnp-%{version}.tar.bz2 Patch0: libupnp.patch # build information -Prefix: %{l_prefix} -BuildRoot: %{l_buildroot} -BuildPreReq: OpenPKG, openpkg >= 20040130, make -PreReq: OpenPKG, openpkg >= 20040130 -AutoReq: no -AutoReqProv: no +BuildPreReq: OpenPKG, openpkg >= 20100101, make +PreReq: OpenPKG, openpkg >= 20100101 %description The portable Universal Plug and Play (UPnP) SDK provides support @@ -98,15 +94,13 @@ GREP=grep \ ./configure \ --prefix=%{l_prefix} \ + --disable-optssdp \ --disable-shared # build using parallel make %{l_make} %{l_mflags -O} %install - # remove previously existing installations - rm -rf $RPM_BUILD_ROOT - # run the native installation logic %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT @@ -128,10 +122,10 @@ # install examples %{l_shtool} mkdir -f -p -m 755 \ $RPM_BUILD_ROOT%{l_prefix}/share/libupnp/examples - %{l_shtool} install -c -m 755 \ - upnp/sample/upnp_tv_combo \ - upnp/sample/upnp_tv_ctrlpt \ - upnp/sample/upnp_tv_device \ + %{l_shtool} install -c -m 755 -s \ + upnp/sample/tv_combo \ + upnp/sample/tv_ctrlpt \ + upnp/sample/tv_device \ $RPM_BUILD_ROOT%{l_prefix}/share/libupnp/examples/ # determine installation files @@ -144,7 +138,6 @@ %files -f files %clean - rm -rf $RPM_BUILD_ROOT %post # after installing or upgrading package networking reminder