Logoj0ke.net Open Build Service > Projects > multimedia:SL11 > xine-lib > Changes
Sign Up | Log In

Changes of Revision 18

[-] Changed xine-lib.spec
​x
 
1
@@ -26,20 +26,19 @@
2
 # --without distributable   -> build libxine1-codecs
3
 #
4
 # default for buildservice is no patented codecs
5
-%bcond_without distributable
6
 %bcond_with onlynondistributable
7
 %if 0%{suse_version} >= 1100
8
 %bcond_without pulseaudio
9
 %else
10
 %bcond_with pulseaudio
11
 %endif
12
-%bcond_with sdl
13
-%bcond_with aalib
14
-%bcond_with arts
15
-%bcond_with esd
16
-%bcond_with jack
17
+%bcond_without sdl
18
+%bcond_without aalib
19
+%bcond_without arts
20
+%bcond_without esd
21
+%bcond_without jack
22
 %bcond_without gnome_vfs
23
-%bcond_with directfb
24
+%bcond_without directfb
25
 %if 0%{suse_version} > 1110
26
 %bcond_without modplug
27
 %else
28
@@ -53,7 +52,7 @@
29
 BuildRequires:  libcdio-devel libdrm-devel libmng-devel libsmbclient
30
 BuildRequires:  Mesa-devel libsmbclient-devel libtheora-devel libvorbis-devel
31
 BuildRequires:  readline-devel update-desktop-files vcdimager-devel
32
-BuildRequires:  speex-devel
33
+BuildRequires:  libspeex-devel
34
 %if 0%{suse_version} >= 1110
35
 BuildRequires:  libv4l-devel
36
 %endif
37
@@ -101,7 +100,7 @@
38
 BuildRequires:  libmodplug-devel
39
 %endif
40
 Version:        1.1.19
41
-Release:        45
42
+Release:        1.pm.44.5
43
 # bug437293
44
 %ifarch ppc64
45
 Obsoletes:      xine-lib-64bit
46
@@ -724,7 +723,7 @@
47
 # install documentation
48
 install -m 0644 %{SOURCE10} COPYING AUTHORS %{buildroot}%{_defaultdocdir}/xine/
49
 %if !%{with distributable}
50
-touch ${RPM_BUILD_ROOT}%{_datadir}/xine/mad
51
+touch ${RPM_BUILD_ROOT}%{_datadir}/xine/mad || echo "can't touch"
52
 %endif
53
 # remove usless READMEs
54
 rm %{buildroot}%{_defaultdocdir}/xine/README.{irix,solaris,WIN32}
55
@@ -899,7 +898,7 @@
56
 xargs -i+ strip --strip-debug %{buildroot}/+ <files.codecs
57
 %endif
58
 %endif
59
-%if %{with onlynondistributable}
60
+%if %{with distributable}
61
 for i in files files.*; do
62
   test "$i" = 'files.codecs' || xargs -i+ rm -f %{buildroot}/+ < $i
63
 done
64
@@ -912,7 +911,7 @@
65
66
 %clean
67
 rm -rf %{buildroot}
68
-%if !%{with onlynondistributable}
69
+%if !%{with distributable}
70
71
 %post -n libxine1 -p /sbin/ldconfig
72
73
@@ -1005,8 +1004,6 @@
74
 %endif
75
76
 %changelog
77
-* Thu Nov 18 2010 coolo@novell.com
78
-- add patch from arch linux to fix build with newer xorg
79
 * Tue Aug  3 2010 lnussel@suse.de
80
 - remove unneeded libcdio-mini-devel buildignore again
81
 * Mon Jul 26 2010 Manfred.Tremmel@iiv.de
82
​
[+] Added xine-lib.spec.pm ^

Cancel