OpenPKG Specs / changeset

     1.1 --- a/libupnp/libupnp.patch	Tue Aug 28 19:02:05 2012 +0200
     1.2 +++ b/libupnp/libupnp.patch	Tue Aug 28 19:02:10 2012 +0200
     1.3 @@ -1,48 +1,48 @@
     1.4 -Index: upnp/sample/tvctrlpt/linux/upnp_tv_ctrlpt_main.c
     1.5 -diff -Nau upnp/sample/tvctrlpt/linux/upnp_tv_ctrlpt_main.c.orig upnp/sample/tvctrlpt/linux/upnp_tv_ctrlpt_main.c
     1.6 ---- upnp/sample/tvctrlpt/linux/upnp_tv_ctrlpt_main.c.orig	2008-03-22 17:48:13.000000000 +0100
     1.7 -+++ upnp/sample/tvctrlpt/linux/upnp_tv_ctrlpt_main.c	2009-01-12 16:05:10.847325711 +0100
     1.8 -@@ -429,7 +429,11 @@
     1.9 -      */
    1.10 -     sigemptyset( &sigs_to_catch );
    1.11 -     sigaddset( &sigs_to_catch, SIGINT );
    1.12 +Index: upnp/sample/linux/tv_ctrlpt_main.c
    1.13 +diff -Nau upnp/sample/linux/tv_ctrlpt_main.c.orig upnp/sample/linux/tv_ctrlpt_main.c
    1.14 +--- upnp/sample/linux/tv_ctrlpt_main.c.orig	2008-03-22 17:48:13.000000000 +0100
    1.15 ++++ upnp/sample/linux/tv_ctrlpt_main.c	2009-01-12 16:05:10.847325711 +0100
    1.16 +@@ -60,7 +60,11 @@
    1.17 + 	/* Catch Ctrl-C and properly shutdown */
    1.18 + 	sigemptyset(&sigs_to_catch);
    1.19 + 	sigaddset(&sigs_to_catch, SIGINT);
    1.20  +#if (defined(sun) && defined(__svr4__))
    1.21 -+    sigwait( &sigs_to_catch );
    1.22 ++	sigwait(&sigs_to_catch);
    1.23  +#else
    1.24 -     sigwait( &sigs_to_catch, &sig );
    1.25 + 	sigwait(&sigs_to_catch, &sig);
    1.26  +#endif
    1.27 - 
    1.28 -     SampleUtil_Print( "Shutting down on signal %d...", sig );
    1.29 - #else
    1.30 -Index: upnp/sample/tvcombo/linux/upnp_tv_combo_main.c
    1.31 -diff -Nau upnp/sample/tvcombo/linux/upnp_tv_combo_main.c.orig upnp/sample/tvcombo/linux/upnp_tv_combo_main.c
    1.32 ---- upnp/sample/tvcombo/linux/upnp_tv_combo_main.c.orig	2009-01-12 16:12:00.406762331 +0100
    1.33 -+++ upnp/sample/tvcombo/linux/upnp_tv_combo_main.c	2009-01-12 16:14:23.401611284 +0100
    1.34 -@@ -477,7 +477,11 @@
    1.35 -      */
    1.36 -     sigemptyset( &sigs_to_catch );
    1.37 -     sigaddset( &sigs_to_catch, SIGINT );
    1.38 + 	SampleUtil_Print("Shutting down on signal %d...\n", sig);
    1.39 + #endif
    1.40 + 	rc = TvCtrlPointStop();
    1.41 +Index: upnp/sample/linux/tv_combo_main.c
    1.42 +diff -Nau upnp/sample/linux/tv_combo_main.c.orig upnp/sample/linux/tv_combo_main.c
    1.43 +--- upnp/sample/linux/tv_combo_main.c.orig	2009-01-12 16:12:00.406762331 +0100
    1.44 ++++ upnp/sample/linux/tv_combo_main.c	2009-01-12 16:14:23.401611284 +0100
    1.45 +@@ -61,7 +61,11 @@
    1.46 + 	/* Catch Ctrl-C and properly shutdown */
    1.47 + 	sigemptyset(&sigs_to_catch);
    1.48 + 	sigaddset(&sigs_to_catch, SIGINT);
    1.49  +#if (defined(sun) && defined(__svr4__))
    1.50 -+    sigwait( &sigs_to_catch );
    1.51 ++	sigwait(&sigs_to_catch);
    1.52  +#else
    1.53 -     sigwait( &sigs_to_catch, &sig );
    1.54 + 	sigwait(&sigs_to_catch, &sig);
    1.55  +#endif
    1.56 - 
    1.57 -     SampleUtil_Print( "Shutting down on signal %d...\n", sig );
    1.58 - #else
    1.59 -Index: upnp/sample/tvdevice/linux/upnp_tv_device_main.c
    1.60 -diff -Nau upnp/sample/tvdevice/linux/upnp_tv_device_main.c.orig upnp/sample/tvdevice/linux/upnp_tv_device_main.c
    1.61 ---- upnp/sample/tvdevice/linux/upnp_tv_device_main.c.orig	2008-03-22 18:04:30.000000000 +0100
    1.62 -+++ upnp/sample/tvdevice/linux/upnp_tv_device_main.c	2009-01-12 16:19:03.504059810 +0100
    1.63 -@@ -184,7 +184,11 @@
    1.64 -      */
    1.65 -     sigemptyset( &sigs_to_catch );
    1.66 -     sigaddset( &sigs_to_catch, SIGINT );
    1.67 + 	SampleUtil_Print("Shutting down on signal %d...\n", sig);
    1.68 + #endif
    1.69 + 	TvDeviceStop();
    1.70 +Index: upnp/sample/linux/tv_device_main.c
    1.71 +diff -Nau upnp/sample/linux/tv_device_main.c.orig upnp/sample/linux/tv_device_main.c
    1.72 +--- upnp/sample/linux/tv_device_main.c.orig	2008-03-22 18:04:30.000000000 +0100
    1.73 ++++ upnp/sample/linux/tv_device_main.c	2009-01-12 16:19:03.504059810 +0100
    1.74 +@@ -59,7 +59,11 @@
    1.75 + 	/* Catch Ctrl-C and properly shutdown */
    1.76 + 	sigemptyset(&sigs_to_catch);
    1.77 + 	sigaddset(&sigs_to_catch, SIGINT);
    1.78  +#if (defined(sun) && defined(__svr4__))
    1.79 -+    sigwait( &sigs_to_catch );
    1.80 ++	sigwait(&sigs_to_catch);
    1.81  +#else
    1.82 -     sigwait( &sigs_to_catch, &sig );
    1.83 + 	sigwait(&sigs_to_catch, &sig);
    1.84  +#endif
    1.85 - 
    1.86 -     SampleUtil_Print( "Shutting down on signal %d...\n", sig );
    1.87 - #else
    1.88 + 	SampleUtil_Print("Shutting down on signal %d...\n", sig);
    1.89 + #endif
    1.90 + 	rc = TvDeviceStop();

     2.1 --- a/libupnp/libupnp.spec	Tue Aug 28 19:02:05 2012 +0200
     2.2 +++ b/libupnp/libupnp.spec	Tue Aug 28 19:02:10 2012 +0200
     2.3 @@ -1,6 +1,6 @@
     2.4  ##
     2.5  ##  libupnp.spec -- OpenPKG RPM Specification
     2.6 -##  Copyright (c) 2009 Michael Schloh von Bennewitz <michael@schloh.com>
     2.7 +##  Copyright (c) 2012 Michael Schloh von Bennewitz <michael@schloh.com>
     2.8  ##
     2.9  ##  Permission to use, copy, modify, and distribute this software for
    2.10  ##  any purpose with or without fee is hereby granted, provided that
    2.11 @@ -32,20 +32,16 @@
    2.12  Class:        EVAL
    2.13  Group:        Network
    2.14  License:      BSD
    2.15 -Version:      1.6.6
    2.16 -Release:      20090106
    2.17 +Version:      1.6.17
    2.18 +Release:      20120800
    2.19  
    2.20  #   list of sources
    2.21  Source0:      http://switch.dl.sourceforge.net/pupnp/libupnp-%{version}.tar.bz2
    2.22  Patch0:       libupnp.patch
    2.23  
    2.24  #   build information
    2.25 -Prefix:       %{l_prefix}
    2.26 -BuildRoot:    %{l_buildroot}
    2.27 -BuildPreReq:  OpenPKG, openpkg >= 20040130, make
    2.28 -PreReq:       OpenPKG, openpkg >= 20040130
    2.29 -AutoReq:      no
    2.30 -AutoReqProv:  no
    2.31 +BuildPreReq:  OpenPKG, openpkg >= 20100101, make
    2.32 +PreReq:       OpenPKG, openpkg >= 20100101
    2.33  
    2.34  %description
    2.35      The portable Universal Plug and Play (UPnP) SDK provides support
    2.36 @@ -98,15 +94,13 @@
    2.37      GREP=grep \
    2.38      ./configure \
    2.39          --prefix=%{l_prefix} \
    2.40 +        --disable-optssdp \
    2.41          --disable-shared
    2.42  
    2.43      #   build using parallel make
    2.44      %{l_make} %{l_mflags -O}
    2.45  
    2.46  %install
    2.47 -    #   remove previously existing installations
    2.48 -    rm -rf $RPM_BUILD_ROOT
    2.49 -
    2.50      #   run the native installation logic
    2.51      %{l_make} %{l_mflags} install DESTDIR=$RPM_BUILD_ROOT
    2.52  
    2.53 @@ -128,10 +122,10 @@
    2.54      #   install examples
    2.55      %{l_shtool} mkdir -f -p -m 755 \
    2.56          $RPM_BUILD_ROOT%{l_prefix}/share/libupnp/examples
    2.57 -    %{l_shtool} install -c -m 755 \
    2.58 -        upnp/sample/upnp_tv_combo \
    2.59 -        upnp/sample/upnp_tv_ctrlpt \
    2.60 -        upnp/sample/upnp_tv_device \
    2.61 +    %{l_shtool} install -c -m 755 -s \
    2.62 +        upnp/sample/tv_combo \
    2.63 +        upnp/sample/tv_ctrlpt \
    2.64 +        upnp/sample/tv_device \
    2.65          $RPM_BUILD_ROOT%{l_prefix}/share/libupnp/examples/
    2.66  
    2.67      #   determine installation files
    2.68 @@ -144,7 +138,6 @@
    2.69  %files -f files
    2.70  
    2.71  %clean
    2.72 -    rm -rf $RPM_BUILD_ROOT
    2.73  
    2.74  %post
    2.75      #   after installing or upgrading package networking reminder