Packman Build Service PMBS

Changes of Revision 24

mediatomb.spec Changed

@@ -161,18 +161,7 @@
 This package contains a sqlite enabled binary.
 
 %prep
-%setup -q %{name}-%{version}
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-%patch5 -p1
-%patch6 -p1
-%patch7 -p1
-%patch8 -p1
-%patch9 -p1
-%patch10 -p1
+%autosetup -p1
 
 %build
 cp %{SOURCE2} .
@@ -197,8 +186,8 @@
 	--enable-libjs \
 	--enable-taglib 
 
-make %{?_smp_mflags}
-%makeinstall \
+%make_build
+%make_install \
 	INSTALL="install -p"
 mv %{buildroot}%{_bindir}/mediatomb \
 	%{buildroot}%{_bindir}/mediatomb-mysql
@@ -217,9 +206,9 @@
 	--enable-inotify \
 	--enable-libjs \
 	--enable-taglib 
-make %{?_smp_mflags}
+%make_build
 
-%makeinstall \
+%make_install \
 	INSTALL="install -p"
 mv %{buildroot}%{_bindir}/mediatomb \
 	%{buildroot}%{_bindir}/mediatomb-sqlite
@@ -260,9 +249,6 @@
 }
 EOF
 
-%clean
-%{?buildroot:rm -rf %{buildroot}}
-
 %pre
 # create group if necessary
 /usr/bin/getent group mediatomb >/dev/null || \
@@ -317,8 +303,8 @@
 fi
 
 %files
-%defattr(-,root,root)
-%doc AUTHORS ChangeLog COPYING README*
+%license COPYING
+%doc README*
 %doc doc/scripting*
 %attr(0660,mediatomb,mediatomb) %config(noreplace) %{_sysconfdir}/%{name}.conf
 %attr(0750,mediatomb,mediatomb) %dir %{_sysconfdir}/%{name}
@@ -330,11 +316,9 @@
 %{_mandir}/man1/*
 
 %files mysql
-%defattr(-,root,root)
 %{_bindir}/mediatomb-mysql
 
 %files sqlite
-%defattr(-,root,root)
 %{_bindir}/mediatomb-sqlite
 %attr(750,mediatomb,mediatomb) %dir %{_localstatedir}/lib/%{name}
 %attr(0660,mediatomb,mediatomb) %{_localstatedir}/lib/%{name}/*

mediatomb.patch Changed

@@ -9,3 +9,42 @@
      ret = iconv(cd, (const char**)input_ptr, &input_bytes,
              output_ptr, &output_bytes);
  #else
+--- a/tombupnp/upnp/src/api/upnpapi.c
++++ b/tombupnp/upnp/src/api/upnpapi.c
+@@ -104,6 +104,12 @@
+ /*
+  ****************** */
+ 
++membuffer gUserHTTPHeaders;
++int gMaxHTTPTimeoutRetries;
++int gUpnpSdkShutdown;
++userHTTPHeaderList *pUserHTTPHeaderList;
++virtualDirList *pVirtualDirList;
++
+ //Mutex to synchronize the subscription handling at the client side
+ CLIENTONLY( ithread_mutex_t GlobalClientSubscribeMutex;
+      )
+--- a/tombupnp/upnp/src/inc/upnpapi.h
++++ b/tombupnp/upnp/src/inc/upnpapi.h
+@@ -192,17 +192,16 @@ void UpnpThreadDistribution(struct UpnpN
+ void AutoAdvertise(void *input); 
+ int getlocalhostname(char *out);
+ 
+-virtualDirList *pVirtualDirList;
+-userHTTPHeaderList *pUserHTTPHeaderList;
++extern userHTTPHeaderList *pUserHTTPHeaderList;
+ // concatenated list of custom http headers
+-membuffer gUserHTTPHeaders;
++extern membuffer gUserHTTPHeaders;
+ 
+ 
+ extern WebServerState bWebServerState;
+ 
+-int gUpnpSdkShutdown;
++extern int gUpnpSdkShutdown;
+ 
+-int gMaxHTTPTimeoutRetries;
++extern int gMaxHTTPTimeoutRetries;
+ #endif
+ 
+