Packman Build Service PMBS

Changes of Revision 15

mediatomb.spec Changed

@@ -16,12 +16,6 @@
 # Please submit bugfixes or comments via http://bugs.links2linux.org/
 #
 
-%if 0%{?suse_version} >= 1210
-%define _with_js	1
-%else
-%define _with_js        0
-%endif
-
 Name:           mediatomb
 Version:        0.12.1.svn2103
 Release:        0.pm.1
@@ -71,11 +65,7 @@
 BuildRequires:  pkgconfig(libexif)
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
-%if "%{_with_js}" == "1"
 BuildRequires:  js-devel
-# does not seem necessary and prevents openSUSE 13.2 build...
-# BuildRequires:  xulrunner-devel
-%endif
 
 Requires:       %{name}-dbbackend = %{version}
 Requires:       logrotate
@@ -168,19 +158,10 @@
 
 %prep
 %setup -q %{name}-%{version}
-autoreconf -i
 %patch0 -p1
 %patch1 -p1
-%if 0%{?suse_version} >= 1220
 %patch2 -p1
-%endif
-%if 0%{?suse_version} >= 1210
 %patch3 -p1
-# add subdir-objects option
-sed '/AM_INIT_AUTOMAKE/s/\(-Wall\)/\1 subdir-objects/' -i configure.ac
-# we patched configure.ac
-autoreconf -i
-%endif
 %patch4 -p1
 %patch5 -p1
 %patch6 -p1
@@ -189,8 +170,10 @@
 cp %{SOURCE2} .
 
 %build
-# otherwise rpmlint is yelling:
-#... rpm-buildroot-usage ...
+# add subdir-objects option
+sed '/AM_INIT_AUTOMAKE/s/\(-Wall\)/\1 subdir-objects/' -i configure.ac
+# we patched configure.ac
+autoreconf -if
 
 %install
 
@@ -205,9 +188,7 @@
 	--enable-libmagic \
 	--enable-libexif \
 	--enable-inotify \
-%if "%{_with_js}" == "1"
 	--enable-libjs \
-%endif
 	--enable-taglib 
 
 make %{?_smp_flags}
@@ -228,9 +209,7 @@
 	--enable-libmagic \
 	--enable-libexif \
 	--enable-inotify \
-%if "%{_with_js}" == "1"
 	--enable-libjs \
-%endif
 	--enable-taglib 
 make %{?_smp_flags}