[svn] r5323 - in trunk/rpms: . darkstat munin rfb wine xine-lib
packagers at lists.rpmforge.net
packagers at lists.rpmforge.net
Sun Apr 29 15:09:01 CEST 2007
Author: dag
Date: 2007-04-29 15:09:01 +0200 (Sun, 29 Apr 2007)
New Revision: 5323
Added:
trunk/rpms/munin/
trunk/rpms/munin/munin-1.2.4-conf.patch
trunk/rpms/munin/munin-1.2.4-cron.patch
trunk/rpms/munin/munin-1.2.4-sendmail-config
trunk/rpms/munin/munin-1.2.5-hddtemp_smartctl-config
trunk/rpms/munin/munin.spec
Modified:
trunk/rpms/darkstat/darkstat.spec
trunk/rpms/rfb/rfb.spec
trunk/rpms/wine/wine.spec
trunk/rpms/xine-lib/xine-lib.spec
Log:
Updates
Modified: trunk/rpms/darkstat/darkstat.spec
===================================================================
--- trunk/rpms/darkstat/darkstat.spec 2007-04-29 11:25:54 UTC (rev 5322)
+++ trunk/rpms/darkstat/darkstat.spec 2007-04-29 13:09:01 UTC (rev 5323)
@@ -10,7 +10,7 @@
Summary: Network traffic analyzer
Name: darkstat
-Version: 3.0.540
+Version: 3.0.619
Release: 1
License: GPL
Group: Applications/Internet
@@ -43,11 +43,14 @@
%files
%defattr(-, root, root, 0755)
-%doc AUTHORS COPYING* LICENSE INSTALL README
+%doc AUTHORS COPYING* INSTALL LICENSE NEWS README THANKS
%doc %{_mandir}/man1/darkstat.1*
%{_sbindir}/darkstat
%changelog
+* Sun Apr 29 2007 Dag Wieers <dag at wieers.com> - 3.0.619-1
+- Updated to release 3.0.619.
+
* Mon Aug 07 2006 Dag Wieers <dag at wieers.com> - 3.0.540-1
- Updated to release 3.0.540.
Added: trunk/rpms/munin/munin-1.2.4-conf.patch
===================================================================
--- trunk/rpms/munin/munin-1.2.4-conf.patch (rev 0)
+++ trunk/rpms/munin/munin-1.2.4-conf.patch 2007-04-29 13:09:01 UTC (rev 5323)
@@ -0,0 +1,12 @@
+diff -Nur munin-1.2.4.orig/server/munin.conf.in munin-1.2.4/server/munin.conf.in
+--- munin-1.2.4.orig/server/munin.conf.in 2005-10-08 04:11:02.000000000 -0600
++++ munin-1.2.4/server/munin.conf.in 2006-04-22 14:17:46.000000000 -0600
+@@ -24,7 +24,7 @@
+ #contact.nagios.command /usr/sbin/send_nsca -H nagios.host.com -c /etc/send_nsca.cfg
+
+ # a simple host tree
+-[@@HOSTNAME@@]
++[localhost]
+ address 127.0.0.1
+ use_node_name yes
+
Added: trunk/rpms/munin/munin-1.2.4-cron.patch
===================================================================
--- trunk/rpms/munin/munin-1.2.4-cron.patch (rev 0)
+++ trunk/rpms/munin/munin-1.2.4-cron.patch 2007-04-29 13:09:01 UTC (rev 5323)
@@ -0,0 +1,8 @@
+diff -Nur munin-1.2.4.orig/dists/redhat/munin.cron.d munin-1.2.4/dists/redhat/munin.cron.d
+--- munin-1.2.4.orig/dists/redhat/munin.cron.d 2005-10-08 04:11:01.000000000 -0600
++++ munin-1.2.4/dists/redhat/munin.cron.d 2006-04-22 14:10:48.000000000 -0600
+@@ -5,4 +5,3 @@
+ MAILTO=root
+
+ */5 * * * * munin test -x /usr/bin/munin-cron && /usr/bin/munin-cron
+-10 10 * * * munin test -x /usr/share/munin/munin-nagios && /usr/share/munin/munin-nagios --removeok
Added: trunk/rpms/munin/munin-1.2.4-sendmail-config
===================================================================
--- trunk/rpms/munin/munin-1.2.4-sendmail-config (rev 0)
+++ trunk/rpms/munin/munin-1.2.4-sendmail-config 2007-04-29 13:09:01 UTC (rev 5323)
@@ -0,0 +1,3 @@
+[sendmail*]
+user root
+env.mspqueue /var/spool/clientmqueue
Added: trunk/rpms/munin/munin-1.2.5-hddtemp_smartctl-config
===================================================================
--- trunk/rpms/munin/munin-1.2.5-hddtemp_smartctl-config (rev 0)
+++ trunk/rpms/munin/munin-1.2.5-hddtemp_smartctl-config 2007-04-29 13:09:01 UTC (rev 5323)
@@ -0,0 +1,2 @@
+[hddtemp_smartctl]
+user root
Added: trunk/rpms/munin/munin.spec
===================================================================
--- trunk/rpms/munin/munin.spec (rev 0)
+++ trunk/rpms/munin/munin.spec 2007-04-29 13:09:01 UTC (rev 5323)
@@ -0,0 +1,384 @@
+# $Id$
+# Authority: dag
+# Upstream: Ingvar Hagelund <ingvar$linpro,no>
+
+%define perl_vendorlib %(eval "`%{__perl} -V:installvendorlib`"; echo $installvendorlib)
+%define logmsg logger -t %{name}/rpm
+
+Summary: Network-wide graphing framework (grapher/gatherer)
+Name: munin
+Version: 1.2.5
+Release: 1
+License: GPL
+Group: System Environment/Daemons
+URL: http://munin.projects.linpro.no/
+
+Source0: http://dl.sf.net/sourceforge/munin/munin_%{version}.tar.gz
+Source1: munin-1.2.5-hddtemp_smartctl-config
+Source2: munin-1.2.4-sendmail-config
+Patch0: munin-1.2.4-cron.patch
+Patch1: munin-1.2.4-conf.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+
+BuildArch: noarch
+Requires: perl-HTML-Template, perl-Net-Server, perl-Net-SNMP
+Requires: rrdtool, shadow-utils
+
+%description
+Munin is a highly flexible and powerful solution used to create graphs of
+virtually everything imaginable throughout your network, while still
+maintaining a rattling ease of installation and configuration.
+
+This package contains the grapher/gatherer. You will only need one instance of
+it in your network. It will periodically poll all the nodes in your network
+it's aware of for data, which it in turn will use to create graphs and HTML
+pages, suitable for viewing with your graphical web browser of choice.
+
+%package node
+Group: System Environment/Daemons
+Summary: Network-wide graphing framework (node)
+
+Requires: perl-Net-Server
+Requires: procps >= 2.0.7
+Requires: shadow-utils, sysstat
+Requires: /sbin/chkconfig
+Requires: /sbin/service
+
+%description node
+Munin is a highly flexible and powerful solution used to create graphs of
+virtually everything imaginable throughout your network, while still
+maintaining a rattling ease of installation and configuration.
+
+This package contains node software. You should install it on all the nodes
+in your network. It will know how to extract all sorts of data from the
+node it runs on, and will wait for the gatherer to request this data for
+further processing.
+
+It includes a range of plugins capable of extracting common values such as
+cpu usage, network usage, load average, and so on. Creating your own plugins
+which are capable of extracting other system-specific values is very easy,
+and is often done in a matter of minutes. You can also create plugins which
+relay information from other devices in your network that can't run Munin,
+such as a switch or a server running another operating system, by using
+SNMP or similar technology.
+
+%prep
+%setup
+%patch0 -p1
+%patch1 -p1
+
+### htmldoc and html2text are not available for Red Hat. Quick hack with perl:
+### Skip the PDFs.
+%{__perl} -pi.orig -e 's|htmldoc munin|cat munin| or s|html(2text\|doc)|# $&|' Makefile
+%{__perl} -pi.orig -e 's|\$\(INSTALL.+\.(pdf\|txt) \$\(DOCDIR|# $&|' Makefile
+
+### Don't enable munin-node by default.
+%{__perl} -pi.orig -e 's|2345|-|' dists/redhat/munin-node.rc
+
+%{__cat} <<EOF > munin.logrotate.conf
+/var/log/munin/munin-graph.log /var/log/munin/munin-html.log /var/log/munin/munin-limits.log /var/log/munin/munin-update.log {
+ daily
+ missingok
+ rotate 7
+ compress
+ notifempty
+ create 640 munin adm
+}
+EOF
+
+%{__cat} <<EOF >munin-node.logrotate.conf
+/var/log/munin/munin-node.log {
+ daily
+ missingok
+ rotate 7
+ compress
+ copytruncate
+ notifempty
+ create 640 root adm
+}
+EOF
+
+%{__cat} <<EOF >munin.httpd
+# For SSL-servers
+ScriptAlias /munin/cgi/ %{_localstatedir}/www/munin/cgi/
+#<Directory %{_localstatedir}/www/munin/cgi/>
+# Options ExecCGI
+# SSLRequireSSL
+# order deny,allow
+# deny from all
+# AuthType Basic
+# AuthUserFile /site/cfg/passwd
+# AuthGroupFile /site/cfg/group
+# AuthName "munin"
+# require group munin
+# Satisfy Any
+#</Directory>
+#
+Alias /munin/ %{_localstatedir}/www/munin/
+#<Directory %{_localstatedir}/www/munin/>
+# Options None
+# SSLRequireSSL
+# order deny,allow
+# deny from all
+# AuthType Basic
+# AuthUserFile /site/cfg/passwd
+# AuthGroupFile /site/cfg/group
+# AuthName "munin"
+# require group munin
+# Satisfy Any
+#</Directory>
+EOF
+
+%build
+%{__make} build CONFIG="dists/redhat/Makefile.config"
+
+%install
+%{__rm} -rf %{buildroot}
+
+### Install node
+%{__make} install-main install-node install-node-plugins install-doc install-man \
+ CONFIG="dists/redhat/Makefile.config" \
+ DESTDIR="%{buildroot}" \
+ DOCDIR="doc-rpm" \
+ MANDIR="%{buildroot}%{_mandir}"
+# DOCDIR="%{buildroot}%{_docdir}/%{name}-%{version}"
+
+%{__install} -Dp -m0755 dists/redhat/munin-node.rc %{buildroot}%{_initrddir}/munin-node
+%{__install} -Dp -m0644 dists/tarball/plugins.conf %{buildroot}%{_sysconfdir}/munin/plugins.conf
+%{__install} -Dp -m0644 dists/tarball/plugins.conf %{buildroot}%{_sysconfdir}/munin/plugin-conf.d/munin-node
+%{__install} -Dp -m0644 munin-node.logrotate.conf %{buildroot}%{_sysconfdir}/logrotate.d/munin-node
+
+### Remove the Sybase plugin for now, as they need perl modules
+### that are not in extras. We can readd them when/if those modules are added.
+%{__rm} -f %{buildroot}%{_datadir}/munin/plugins/sybase_space
+
+### Install server
+%{__make} install-main \
+ CONFIG="dists/redhat/Makefile.config" \
+ DESTDIR="%{buildroot}"
+
+%{__install} -Dp -m0644 dists/redhat/munin.cron.d %{buildroot}%{_sysconfdir}/cron.d/munin
+%{__install} -Dp -m0644 server/style.css %{buildroot}%{_localstatedir}/www/munin/style.css
+%{__install} -Dp -m0644 munin.logrotate.conf %{buildroot}%{_sysconfdir}/logrotate.d/munin
+%{__install} -Dp -m0644 munin.httpd %{buildroot}%{_sysconfdir}/httpd/conf.d/munin.conf
+
+### Move munin CGI to /var/www/munin
+%{__install} -dp -m0755 %{buildroot}%{_localstatedir}/www/munin/cgi/
+%{__mv} -v %{buildroot}%{_localstatedir}/www/html/munin/cgi/munin-cgi-graph \
+ %{buildroot}%{_localstatedir}/www/munin/cgi/munin-cgi-graph
+
+### Install config for hddtemp_smartctl
+%{__install} -Dp -m0644 %{SOURCE1} %{buildroot}/etc/munin/plugin-conf.d/hddtemp_smartctl
+
+### Install config for sendmail under fedora
+%{__install} -Dp -m0644 %{SOURCE2} %{buildroot}/etc/munin/plugin-conf.d/sendmail
+
+%{__install} -dp -m0755 %{buildroot}%{_localstatedir}/lib/munin/
+%{__install} -dp -m0755 %{buildroot}%{_localstatedir}/log/munin/
+%{__install} -dp -m0755 %{buildroot}%{_sysconfdir}/munin/plugins/
+
+%clean
+%{__rm} -rf %{buildroot}
+
+# Main package scripts
+# uid 18 is the next uid in http://fedoraproject.org/wiki/PackageUserRegistry
+%pre
+if ! /usr/bin/getent group munin &>/dev/null; then
+ /usr/sbin/groupadd -r munin || \
+ %logmsg "Unexpected error adding group \"munin\". Aborting installation."
+fi
+if ! /usr/bin/id munin &>/dev/null; then
+ /usr/sbin/useradd -r -s /bin/nologin -d %{_localstatedir}/lib/munin -c "Munin user" -g munin munin || \
+ %logmsg "Unexpected error adding user \"munin\". Aborting installation."
+fi
+
+%postun
+if [ $1 -ne 0 ]; then
+ /usr/sbin/userdel munin || %logmsg "User \"munin\" could not be deleted."
+ /usr/sbin/groupdel munin || %logmsg "Group \"munin\" could not be deleted."
+fi
+
+### Node package scripts
+### uid 18 is the next uid in http://fedoraproject.org/wiki/PackageUserRegistry
+%pre node
+if ! /usr/bin/getent group munin &>/dev/null; then
+ /usr/sbin/groupadd -r munin || \
+ %logmsg "Unexpected error adding group \"munin\". Aborting installation."
+fi
+if ! /usr/bin/id munin &>/dev/null; then
+ /usr/sbin/useradd -r -s /bin/nologin -d %{_localstatedir}/lib/munin -c "Munin user" -g munin munin || \
+ %logmsg "Unexpected error adding user \"munin\". Aborting installation."
+fi
+
+%post node
+/sbin/chkconfig --add munin-node
+/usr/sbin/munin-node-configure --shell | sh
+
+%preun node
+if [ $1 -ne 0 ]; then
+ /sbin/service munin-node stop &>/dev/null || :
+ /sbin/chkconfig --del munin-node
+fi
+
+%postun node
+if [ $1 -ne 0 ]; then
+ /usr/sbin/userdel munin || %logmsg "User \"munin\" could not be deleted."
+ /usr/sbin/groupdel munin || %logmsg "Group \"munin\" could not be deleted."
+fi
+
+%files
+%defattr(-, root, root, 0755)
+%doc ChangeLog COPYING README.api munin-*.html build/README-apache-cgi
+%doc %{_mandir}/man5/munin.conf.5*
+%doc %{_mandir}/man8/munin-cron.8*
+%doc %{_mandir}/man8/munin-graph.8*
+%doc %{_mandir}/man8/munin-html.8*
+%doc %{_mandir}/man8/munin-limits.8*
+%doc %{_mandir}/man8/munin-update.8*
+%config(noreplace) %{_sysconfdir}/cron.d/munin
+%dir %{_sysconfdir}/munin/
+%config(noreplace) %{_sysconfdir}/munin/munin.conf
+%config(noreplace) %{_sysconfdir}/munin/templates/
+%config(noreplace) %{_sysconfdir}/logrotate.d/munin
+%dir %{_sysconfdir}/httpd/
+%dir %{_sysconfdir}/httpd/conf.d/
+%config(noreplace) %{_sysconfdir}/httpd/conf.d/munin.conf
+%{_bindir}/munin-cron
+%{_datadir}/munin/munin-graph
+%{_datadir}/munin/munin-html
+%{_datadir}/munin/munin-limits
+%{_datadir}/munin/munin-update
+%{_datadir}/munin/VeraMono.ttf
+%{_localstatedir}/www/munin/
+%{perl_vendorlib}/Munin.pm
+
+%defattr(-, munin, munin, 0755)
+%dir %{_localstatedir}/lib/munin/
+%dir %{_localstatedir}/log/munin/
+%dir %{_localstatedir}/run/munin/
+
+%files node
+%defattr(-, root, root, 0755)
+%doc COPYING node/TODO*
+%doc %{_mandir}/man5/munin-node.conf.5*
+%doc %{_mandir}/man8/munin-node.8*
+%doc %{_mandir}/man8/munin-run.8*
+%doc %{_mandir}/man8/munin-node-configure.8*
+%doc %{_mandir}/man8/munin-node-configure-snmp.8*
+%dir %{_sysconfdir}/munin/
+%dir %{_sysconfdir}/munin/plugin-conf.d/
+%dir %{_sysconfdir}/munin/plugins/
+%config(noreplace) %{_sysconfdir}/logrotate.d/munin-node
+%config(noreplace) %{_sysconfdir}/munin/munin-node.conf
+%config(noreplace) %{_sysconfdir}/munin/plugin-conf.d/hddtemp_smartctl
+%config(noreplace) %{_sysconfdir}/munin/plugin-conf.d/munin-node
+%config(noreplace) %{_sysconfdir}/munin/plugin-conf.d/sendmail
+%config(noreplace) %{_sysconfdir}/munin/plugins.conf
+%config %{_initrddir}/munin-node
+%{_sbindir}/munin-node
+%{_sbindir}/munin-node-configure
+%{_sbindir}/munin-node-configure-snmp
+%{_sbindir}/munin-run
+%dir %{_datadir}/munin/
+%{_datadir}/munin/plugins/
+
+%defattr(-, munin, munin, 0755)
+%dir %{_localstatedir}/lib/munin/
+%dir %{_localstatedir}/lib/munin/plugin-state/
+%dir %{_localstatedir}/log/munin/
+
+%changelog
+* Sun Apr 29 2007 Dag Wieers <dag at wieers.com> - 1.2.5-1
+- Cosmetic changes.
+
+* Mon Oct 23 2006 Ingvar Hagelund <ingvar at linpro.no> - 1.2.5-1rhel4
+- Simple repacking from fc5 to rhel. All kudos to Kevin for
+ maintaining the Fedora Package
+- For perl-Net-SNMP and dependencies not in rhel4, please consider
+ Dag Wieers repo, http://dag.wieers.com/packages/
+
+* Tue Oct 17 2006 Kevin Fenzi <kevin at tummy.com> - 1.2.5-1
+- Update to 1.2.5
+- Fix HD stats (fixes #205042)
+- Add in logrotate scripts that seem to have been dropped upstream
+
+* Tue Jun 27 2006 Kevin Fenzi <kevin at tummy.com> - 1.2.4-9
+- Re-enable snmp plugins now that perl-Net-SNMP is available (fixes 196588)
+- Thanks to Herbert Straub <herbert at linuxhacker.at> for patch.
+- Fix sendmail plugins to look in the right place for the queue
+
+* Sat Apr 22 2006 Kevin Fenzi <kevin at tummy.com> - 1.2.4-8
+- add patch to remove unneeded munin-nagios in cron.
+- add patch to remove buildhostname in munin.conf (fixes #188928)
+- clean up prep section of spec.
+
+* Fri Feb 24 2006 Kevin Fenzi <kevin at scrye.com> - 1.2.4-7
+- Remove bogus Provides for perl RRDs (fixes #182702)
+
+* Thu Feb 16 2006 Kevin Fenzi <kevin at tummy.com> - 1.2.4-6
+- Readded old changelog entries per request
+- Rebuilt for fc5
+
+* Sat Dec 24 2005 Kevin Fenzi <kevin at tummy.com> - 1.2.4-5
+- Fixed ownership for /var/log/munin in node subpackage (fixes 176529)
+
+* Wed Dec 14 2005 Kevin Fenzi <kevin at tummy.com> - 1.2.4-4
+- Fixed ownership for /var/lib/munin in node subpackage
+
+* Wed Dec 14 2005 Kevin Fenzi <kevin at tummy.com> - 1.2.4-3
+- Fixed libdir messup to allow builds on x86_64
+
+* Mon Dec 12 2005 Kevin Fenzi <kevin at tummy.com> - 1.2.4-2
+- Removed plugins that require Net-SNMP and Sybase
+
+* Tue Dec 6 2005 Kevin Fenzi <kevin at tummy.com> - 1.2.4-1
+- Inital cleanup for fedora-extras
+
+* Thu Apr 21 2005 Ingvar Hagelund <ingvar at linpro.no> - 1.2.3-4
+- Fixed a bug in the iostat plugin
+
+* Wed Apr 20 2005 Ingvar Hagelund <ingvar at linpro.no> - 1.2.3-3
+- Added the missing /var/run/munin
+
+* Tue Apr 19 2005 Ingvar Hagelund <ingvar at linpro.no> - 1.2.3-2
+- Removed a lot of unecessary perl dependencies
+
+* Mon Apr 18 2005 Ingvar Hagelund <ingvar at linpro.no> - 1.2.3-1
+- Sync with svn
+
+* Tue Mar 22 2005 Ingvar Hagelund <ingvar at linpro.no> - 1.2.2-5
+- Sync with release of 1.2.2
+- Add some nice text from the suse specfile
+- Minimal changes in the header
+- Some cosmetic changes
+- Added logrotate scripts (stolen from debian package)
+
+* Sun Feb 01 2004 Ingvar Hagelund <ingvar at linpro.no>
+- Sync with CVS. Version 1.0.0pre2
+
+* Sun Jan 18 2004 Ingvar Hagelund <ingvar at linpro.no>
+- Sync with CVS. Change names to munin.
+
+* Fri Oct 31 2003 Ingvar Hagelund <ingvar at linpro.no>
+- Lot of small fixes. Now builds on more RPM distros
+
+* Wed May 21 2003 Ingvar Hagelund <ingvar at linpro.no>
+- Sync with CVS
+- 0.9.5-1
+
+* Tue Apr 1 2003 Ingvar Hagelund <ingvar at linpro.no>
+- Sync with CVS
+- Makefile-based install of core files
+- Build doc (only pod2man)
+
+* Thu Jan 9 2003 Ingvar Hagelund <ingvar at linpro.no>
+- Sync with CVS, auto rpmbuild
+
+* Thu Jan 2 2003 Ingvar Hagelund <ingvar at linpro.no>
+- Fix spec file for RedHat 8.0 and new version of lrrd
+
+* Wed Sep 4 2002 Ingvar Hagelund <ingvar at linpro.no>
+- Small bugfixes in the rpm package
+
+* Tue Jun 18 2002 Kjetil Torgrim Homme <kjetilho at linpro.no>
+- new package
Property changes on: trunk/rpms/munin/munin.spec
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ native
Modified: trunk/rpms/rfb/rfb.spec
===================================================================
--- trunk/rpms/rfb/rfb.spec 2007-04-29 11:25:54 UTC (rev 5322)
+++ trunk/rpms/rfb/rfb.spec 2007-04-29 13:09:01 UTC (rev 5323)
@@ -11,7 +11,7 @@
Summary: heXoNet RFB (remote control for the X Window System)
Name: rfb
Version: 0.6.1
-Release: 6
+Release: 7
License: GPL
Group: User Interface/Desktops
URL: http://www.hexonet.de/software/rfb/
@@ -31,7 +31,7 @@
%{?rh8:BuildRequires: compat-gcc-c++}
### Fix problem with apt requiring compat-gcc-c++ (Panu)
-Requires: compat-libstdc++
+#Requires: compat-libstdc++
%description
The heXoNet RFB Software package includes many different projects. The
@@ -121,6 +121,9 @@
%{!?_without_freedesktop:%{_datadir}/applications/%{desktop_vendor}-xvncconnect.desktop}
%changelog
+* Sat Apr 28 2007 Dag Wieers <dag at wieers.com> - 0.6.1-7
+- Removed the compat-libstdc++ dependency.
+
* Fri Apr 27 2007 Dag Wieers <dag at wieers.com> - 0.6.1-6
- Added Debian patch set.
Modified: trunk/rpms/wine/wine.spec
===================================================================
--- trunk/rpms/wine/wine.spec 2007-04-29 11:25:54 UTC (rev 5322)
+++ trunk/rpms/wine/wine.spec 2007-04-29 13:09:01 UTC (rev 5323)
@@ -46,7 +46,7 @@
Summary: Windows 16/32/64 bit emulator
Name: wine
-Version: 0.9.35
+Version: 0.9.36
Release: 1
License: LGPL
Group: Applications/Emulators
@@ -443,10 +443,12 @@
%{_datadir}/wine/wine.inf
%{_libdir}/libwine.so.1*
%dir %{_libdir}/wine/
+
### exe16
%{_libdir}/wine/gdi.exe16
%{_libdir}/wine/krnl386.exe16
%{_libdir}/wine/user.exe16
+
### exe.so
%{_libdir}/wine/clock.exe.so
%{_libdir}/wine/cmd.exe.so
@@ -483,6 +485,7 @@
%{_libdir}/wine/winver.exe.so
%{_libdir}/wine/wordpad.exe.so
%{_libdir}/wine/xcopy.exe.so
+
### dll16
%{_libdir}/wine/avifile.dll16
%{_libdir}/wine/commdlg.dll16
@@ -522,7 +525,9 @@
%{_libdir}/wine/winsock.dll16
%{_libdir}/wine/wintab.dll16
%{_libdir}/wine/wprocs.dll16
+
### dll.so
+%{_libdir}/wine/acledit.dll.so
%{_libdir}/wine/activeds.dll.so
%{_libdir}/wine/advapi32.dll.so
%{_libdir}/wine/advpack.dll.so
@@ -665,6 +670,7 @@
%{_libdir}/wine/spoolss.dll.so
%{_libdir}/wine/sti.dll.so
%{_libdir}/wine/svrapi.dll.so
+%{_libdir}/wine/sxs.dll.so
%{_libdir}/wine/tapi32.dll.so
%{_libdir}/wine/unicows.dll.so
%{_libdir}/wine/url.dll.so
@@ -689,9 +695,11 @@
%{_libdir}/wine/ws2_32.dll.so
%{_libdir}/wine/wsock32.dll.so
%{_libdir}/wine/wtsapi32.dll.so
+
### ds.so
%{_libdir}/wine/gphoto2.ds.so
%{_libdir}/wine/sane.ds.so
+
### drv16
%{_libdir}/wine/comm.drv16
%{_libdir}/wine/display.drv16
@@ -700,6 +708,7 @@
%{_libdir}/wine/sound.drv16
%{_libdir}/wine/system.drv16
%{_libdir}/wine/wineps16.drv16
+
### drv.so
%{_libdir}/wine/msacm32.drv.so
%{_libdir}/wine/wineaudioio.drv.so
@@ -710,6 +719,7 @@
%{_libdir}/wine/winspool.drv.so
%{_libdir}/wine/winealsa.drv.so
%{_libdir}/wine/wineps.drv.so
+
### vxd
%{_libdir}/wine/ifsmgr.vxd.so
%{_libdir}/wine/mmdevldr.vxd.so
@@ -720,14 +730,17 @@
%{_libdir}/wine/vnetbios.vxd.so
%{_libdir}/wine/vtdapi.vxd.so
%{_libdir}/wine/vwin32.vxd.so
+
### acm.so
%{_libdir}/wine/imaadp32.acm.so
%{_libdir}/wine/msadp32.acm.so
%{_libdir}/wine/msg711.acm.so
%{_libdir}/wine/winemp3.acm.so
+
### tlb.so
%{_libdir}/wine/stdole2.tlb.so
%{_libdir}/wine/stdole32.tlb.so
+
### ocx.so
%{_libdir}/wine/hhctrl.ocx.so
%{_libdir}/wine/msisys.ocx.so
@@ -797,6 +810,9 @@
%{_libdir}/wine/*.def
%changelog
+* Sat Apr 28 2007 Dag Wieers <dag at wieers.com> - 0.9.36-1
+- Updated to release 0.9.36.
+
* Sun Apr 15 2007 Dag Wieers <dag at wieers.com> - 0.9.35-1
- Updated to release 0.9.35.
Modified: trunk/rpms/xine-lib/xine-lib.spec
===================================================================
--- trunk/rpms/xine-lib/xine-lib.spec 2007-04-29 11:25:54 UTC (rev 5322)
+++ trunk/rpms/xine-lib/xine-lib.spec 2007-04-29 13:09:01 UTC (rev 5323)
@@ -18,24 +18,28 @@
%{?fc1:%define _without_xvmc 1}
%{?el3:%define _without_alsa 1}
+%{?el3:%define _without_freetype2_pc 1}
%{?el3:%define _without_fribidi 1}
%{?el3:%define _without_gettextdevel 1}
%{?el3:%define _without_theora 1}
%{?el3:%define _without_xvmc 1}
%{?rh9:%define _without_alsa 1}
+%{?rh9:%define _without_freetype2_pc 1}
%{?rh9:%define _without_fribidi 1}
%{?rh9:%define _without_gettextdevel 1}
%{?rh9:%define _without_theora 1}
%{?rh9:%define _without_xvmc 1}
%{?rh8:%define _without_alsa 1}
+%{?rh8:%define _without_freetype2_pc 1}
%{?rh8:%define _without_fribidi 1}
%{?rh8:%define _without_gettextdevel 1}
%{?rh8:%define _without_theora 1}
%{?rh8:%define _without_xvmc 1}
%{?rh7:%define _without_alsa 1}
+%{?rh7:%define _without_freetype2_pc 1}
%{?rh7:%define _without_fribidi 1}
%{?rh7:%define _without_gettextdevel 1}
%{?rh7:%define _without_theora 1}
@@ -43,6 +47,7 @@
%{?rh7:%define _without_xvmc 1}
%{?yd3:%define _without_alsa 1}
+%{?yd3:%define _without_freetype2_pc 1}
%{?yd3:%define _without_fribidi 1}
%{?yd3:%define _without_gettextdevel 1}
%{?yd3:%define _without_theora 1}
@@ -52,18 +57,15 @@
Summary: Core library of the xine multimedia player
Name: xine-lib
-Version: 1.1.4
+Version: 1.1.6
Release: 1
License: GPL
Group: Applications/Multimedia
URL: http://xinehq.de/
-Source: http://dl.sf.net/xine/xine-lib-%{version}.tar.bz2
-Patch1: xine-lib-1.1.4-optflags.patch
-Patch2: xine-lib-1.1.4-CVE-2007-1246.patch
-Patch3: xine-lib-1.1.3-legacy-flac-init.patch
-Patch6: xine-lib-1.1.1-deepbind-939.patch
-Patch7: xine-lib-1.1.1-multilib-devel.patch
+
+Source: http://downloads.sf.net/xine/xine-lib-%{version}.tar.bz2
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+
Requires: libdvdcss
BuildRequires: gcc-c++, pkgconfig, zlib-devel, libtiff-devel
BuildRequires: libvorbis-devel, SDL-devel, bzip2-devel
@@ -80,6 +82,7 @@
%{!?_without_alsa:BuildRequires: alsa-lib-devel}
%{!?_without_esound:BuildRequires: esound-devel}
%{!?_without_aalib:BuildRequires: aalib-devel}
+%{!?_without_directfb:BuildRequires: directfb-devel}
%{!?_without_flac:BuildRequires: flac-devel}
%{!?_without_libfame:BuildRequires: libfame-devel}
%{!?_without_arts:BuildRequires: arts-devel}
@@ -102,6 +105,7 @@
%{?rh9:BuildRequires: glut-devel}
Obsoletes: xine-libs <= 1.0.0
Obsoletes: libxine <= %{version}
+Obsoletes: xine-libs-moles <= %{version}-%{release}
%description
Xine is a free multimedia player. It plays back CDs, DVDs, and VCDs. It also
@@ -141,29 +145,30 @@
%prep
%setup
-%patch1 -p1 -b .optflags
-%patch2 -p1 -b .CVE-2007-1246
-%patch3 -p0 -b .legacy-flac-init
-### Patch6 needed at least when compiling with external ffmpeg, #939.
-%patch6 -p1 -b .deepbind
-%patch7 -p0 -b .multilib-devel
+%{__perl} -pi -e 's|"/lib /usr/lib\b|"/%{_lib} %{_libdir}|' configure
%build
+%{?_without_freetype2_pc:export FT2_CFLAGS="$(freetype-config --cflags)"}
+%{?_without_freetype2_pc:export FT2_LIBS="$(freetype-config --libs)"}
%configure \
- %{?_with_modxorg:--with-xv-path=%{_libdir}} \
- --enable-ipv6 \
- %{?_with_extffmpeg:--with-external-ffmpeg} \
- %{?_without_alsa:--disable-alsa} \
- %{!?_with_extdvdnav:--with-included-dvdnav} \
- --with-external-a52dec \
- --with-external-libmad \
- --with-pic
+%{?_with_modxorg:--with-xv-path="%{_libdir}"} \
+%{?_without_alsa:--disable-alsa} \
+ --enable-antialiasing \
+%{!?_without_directfb:--enable-directfb} \
+ --enable-ipv6 \
+%{?_with_extffmpeg:--with-external-ffmpeg} \
+%{!?_with_extdvdnav:--with-included-dvdnav} \
+ --with-external-a52dec \
+ --with-external-libmad \
+ --with-fontconfig \
+ --with-freetype \
+ --with-pic
%{__make} %{?_smp_mflags}
%install
%{__rm} -rf %{buildroot}
-%{__make} install DESTDIR=%{buildroot}
+%{__make} install DESTDIR="%{buildroot}"
%find_lang %{libname}
# Remove all those unused docs
%{__rm} -rf %{buildroot}%{_docdir}/xine/ || :
@@ -203,6 +208,12 @@
%changelog
+* Sat Apr 21 2007 Dag Wieers <dag at wieers.com> - 1.1.6-1
+- Updated to release 1.1.6.
+
+* Sun Apr 15 2007 Dag Wieers <dag at wieers.com> - 1.1.5-1
+- Updated to release 1.1.5.
+
* Sun Mar 11 2007 Dag Wieers <dag at wieers.com> - 1.1.4-1
- Updated to release 1.1.4.
- Added Fedora Extras patches.
More information about the svn-commits
mailing list