Author: w.kier Date: Sat Jan 9 19:01:18 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- removed registerodec build - package works via wine
- added dshowserver-make.patch
- dshowserver-optflags.patch merged into dshowserver-make.patch
---- Files affected:
packages/dshowserver:
dshowserver.spec (1.11 -> 1.12)
---- Diffs:
================================================================
Index: packages/dshowserver/dshowserver.spec
diff -u packages/dshowserver/dshowserver.spec:1.11
packages/dshowserver/dshowserver.spec:1.12
--- packages/dshowserver/dshowserver.spec:1.11 Sat Jan 9 17:10:07 2010
+++ packages/dshowserver/dshowserver.spec Sat Jan 9 20:01:13 2010
@@ -1,30 +1,23 @@
# $Revision$, $Date$
# Conditional build:
-%bcond_with static # static package for use with x86_64 systems
#
%define svn 101
-%define rel 0.1
Summary: Win32 CoreAVC H.264 codec helper
Summary(pl.UTF-8): Serwer windowsowego kodeka CoreAVC H.264.
Name: dshowserver
-Version: 0.1
-Release: 0.%{svn}.%{rel}
+Version: 0.%{svn}
+Release: 0.1
License: GPL
Group: X11/Applications/Multimedia
Source0: %{name}-0.svn%{svn}.tar.bz2
-# Source0-md5: 9fa17ea92a3d78c34f251a4c56bbd750
+# Source0-md5: 9a5fefb6dc8e34114ae9ca99ee799eea
Patch0: %{name}-codecspath.patch
-Patch1: %{name}-optflags.patch
+Patch1: %{name}-make.patch
URL: http://code.google.com/p/coreavc-for-linux/
-%ifarch %{x8664}
-BuildRequires: gcc-multilib
-%{?with_static:BuildRequires: glibc-static(i686)}
-%else
-%{?with_static:BuildRequires: glibc-static}
-%endif
BuildRequires: rpmbuild(macros) >= 1.453
BuildRequires: sed >= 4.0
+BuildRequires: wine-devel
ExclusiveArch: %{ix86}
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -53,18 +46,18 @@
x86_64. Jezeli twoj system jest 64 bitowy. Uzyj statycznych binariow
zbudowanych w 32 bitowym srodowisku.
-%package -n registercodec
-Summary: Utility to register win32 CoreAVC H.264 codec
-Summary(pl.UTF-8): Narzedzie do rejestracji windowsowego kodeka CoreAVC
H.264.
-Group: X11/Applications/Multimedia
-
-%description -n registercodec
-Utility to register win32 CoreAVC H.264 codec for usage with
-mythtv/mplayer/xine.
-
-%description -n registercodec -l pl.UTF-8
-Narzedzie do przeprowadzenia rejestracji komercyjnego kodeka CoreAVC
-H.264.
+#%package -n registercodec
+#Summary: Utility to register win32 CoreAVC H.264 codec
+#Summary(pl.UTF-8): Narzedzie do rejestracji windowsowego kodeka CoreAVC
H.264.
+#Group: X11/Applications/Multimedia
+
+#%description -n registercodec
+#Utility to register win32 CoreAVC H.264 codec for usage with
+#mythtv/mplayer/xine.
+
+#%description -n registercodec -l pl.UTF-8
+#Narzedzie do przeprowadzenia rejestracji komercyjnego kodeka CoreAVC
+#H.264.
%prep
%setup -q -n %{name}-svn%{svn}
@@ -77,45 +70,47 @@
%endif
%build
-cat << 'EOF' > config.mak
-override CC = %{__cc}
-override OPTFLAGS = %{rpmcflags}
-override LDFLAGS = %{rpmldflags}
-
-%{?with_static:STATIC = 1}
-
-AR = ar
-RANLIB = ranlib
-OBJDIR = ../objs
-EOF
-%{__make} -C dshowserver
+%{__make}
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT{%{_bindir},%{_mandir}/man1}
-install dshowserver/dshowserver $RPM_BUILD_ROOT%{_bindir}/dshowserver
-install dshowserver/registercodec $RPM_BUILD_ROOT%{_bindir}/registercodec
-cp -a man/* $RPM_BUILD_ROOT%{_mandir}/man1
+%{__make} install -C dshowserver PREFIX=$RPM_BUILD_ROOT/usr
+install -d $RPM_BUILD_ROOT%{_mandir}/man1
+install -d $RPM_BUILD_ROOT%{_docdir}/%{name}-0.svn%{svn}
+#install dshowserver/dshowserver $RPM_BUILD_ROOT%{_bindir}/dshowserver
+#install dshowserver/registercodec $RPM_BUILD_ROOT%{_bindir}/registercodec
+cp -a man/ds* $RPM_BUILD_ROOT%{_mandir}/man1
+cp -a {COPYING,README} $RPM_BUILD_ROOT%{_docdir}/%{name}-0.svn%{svn}
%clean
rm -rf $RPM_BUILD_ROOT
+%post
+echo "How to use that - check %{_docdir}/%{name}-0.svn%{svn}/README"
+
%files
%defattr(644,root,root,755)
%attr(755,root,video) %{_bindir}/dshowserver
+%attr(755,root,video) %{_libdir}/dshowserver/dshowserver.exe.so
%{_mandir}/man1/ds*
+%{_docdir}/%{name}-0.svn%{svn}/*
-%files -n registercodec
-%defattr(644,root,root,755)
-%attr(755,root,video) %{_bindir}/registercodec
-%{_mandir}/man1/re*
+#%files -n registercodec
+#%defattr(644,root,root,755)
+#%attr(755,root,video) %{_bindir}/registercodec
+#%{_mandir}/man1/re*
%define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`)
%changelog
* %{date} PLD Team <[email protected]>
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.12 2010/01/09 19:01:13 w.kier
+- removed registerodec build - package works via wine
+- added dshowserver-make.patch
+- dshowserver-optflags.patch merged into dshowserver-make.patch
+
Revision 1.11 2010/01/09 16:10:07 w.kier
- reenabled patch1
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/dshowserver/dshowserver.spec?r1=1.11&r2=1.12&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
