scm-commits June 2012

scm-commits@lists.fedoraproject.org

406 participants
23700 discussions

[clamav/el6] Correct my broken previous commit :(
by Robert Scheck 30 Jun '12

30 Jun '12

commit 6bd5ce5307f4581e68d96b4849f47dad5edb384f Author: Robert Scheck <robert(a)fedoraproject.org> Date: Sun Jul 1 01:55:11 2012 +0200 Correct my broken previous commit :( .gitignore | 2 +- clamav.spec | 2 +- sources | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) --- diff --git a/.gitignore b/.gitignore index 23e3e8f..36d7010 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ /clamd-wrapper.tar.bz2 /clamav-0.97.5-norar.tar.xz /main-54.cvd -/daily-15050.cvd +/daily-15103.cvd diff --git a/clamav.spec b/clamav.spec index 2bc1881..0e4e8f4 100644 --- a/clamav.spec +++ b/clamav.spec @@ -24,7 +24,7 @@ Source10: clamav-milter.sysconfig # Temporary workaround for broken 0.97.5 tarball Source11: http://db.local.clamav.net/main-54.cvd -Source12: http://db.local.clamav.net/daily-15050.cvd +Source12: http://db.local.clamav.net/daily-15103.cvd BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) diff --git a/sources b/sources index 78cc194..14401b5 100644 --- a/sources +++ b/sources @@ -1,2 +1,4 @@ +f8e88e6adc82349e5babfa6ee7bb98fa clamav-0.97.5-norar.tar.xz +e809f74ed139df2e4af3fafbca32f678 clamd-wrapper.tar.bz2 eb12490fda87d602e476d4b163f8a34b main-54.cvd -d41d8cd98f00b204e9800998ecf8427e daily-15050.cvd +1606d4b9dd4cf9658b22cb8bd135a0e3 daily-15103.cvd

1 0

File daily-15103.cvd uploaded to lookaside cache by robert
by Robert Scheck 30 Jun '12

30 Jun '12

A file has been added to the lookaside cache for clamav: 1606d4b9dd4cf9658b22cb8bd135a0e3 daily-15103.cvd

1 0

[xfce4-wavelan-plugin] Update to 0.5.11
by Christoph Wickert 30 Jun '12

30 Jun '12

commit 0763233eb48bbe81390d6edbdeb2adfc6c57bd45 Author: Christoph Wickert <cwickert(a)fedoraproject.org> Date: Sun Jul 1 01:50:11 2012 +0200 Update to 0.5.11 - Define the Xfce version conditionally - Add review # and VCS key .gitignore | 1 + sources | 2 +- xfce4-wavelan-plugin.spec | 40 ++++++++++++++++++++++++++++++---------- 3 files changed, 32 insertions(+), 11 deletions(-) --- diff --git a/.gitignore b/.gitignore index ccb735e..ac338b9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ xfce4-wavelan-plugin-0.5.5.tar.bz2 /xfce4-wavelan-plugin-0.5.6.tar.bz2 /xfce4-wavelan-plugin-0.5.10.tar.bz2 +/xfce4-wavelan-plugin-0.5.11.tar.bz2 diff --git a/sources b/sources index 3544197..931bf85 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -a4cd20ef471123936e762a139f1025e1 xfce4-wavelan-plugin-0.5.10.tar.bz2 +50514bb286f1ed6761a1b36832bb7fe3 xfce4-wavelan-plugin-0.5.11.tar.bz2 diff --git a/xfce4-wavelan-plugin.spec b/xfce4-wavelan-plugin.spec index d07814d..5a6a8d2 100644 --- a/xfce4-wavelan-plugin.spec +++ b/xfce4-wavelan-plugin.spec @@ -1,20 +1,29 @@ -%global minor_version 0.5 +# Review: https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=173670 + +%global minorversion 0.5 +%if 0%{?fedora} >= 18 + %global xfceversion 4.10 +%else + %global xfceversion 4.8 +%endif Name: xfce4-wavelan-plugin -Version: 0.5.10 -Release: 2%{?dist} +Version: 0.5.11 +Release: 1%{?dist} Summary: WaveLAN plugin for the Xfce panel Group: User Interface/Desktops License: BSD URL: http://goodies.xfce.org/projects/panel-plugins/%{name} -Source0: http://archive.xfce.org/src/panel-plugins/%{name}/%{minor_version}/%{name}-… +#VCS: git:git://git.xfce.org/panel-plugins/xfce4-wavelan-plugin +Source0: http://archive.xfce.org/src/panel-plugins/%{name}/%{minorversion}/%{name}-%… BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: xfce4-panel-devel >= 4.8.0 BuildRequires: libxfce4ui-devel >= 4.8.0 -BuildRequires: gettext, intltool -Requires: xfce4-panel >= 4.8.0 +BuildRequires: xfce4-panel-devel >= 4.8.0 +BuildRequires: gettext +BuildRequires: intltool +Requires: xfce4-panel >= %{xfceversion} %description A plugin for the Xfce panel that monitors a wireless LAN interface. It @@ -31,10 +40,16 @@ make %{?_smp_mflags} %install rm -rf %{buildroot} -make install DESTDIR=%{buildroot} -chmod -c +x %{buildroot}%{_libdir}/xfce4/panel/plugins/libwavelan.so +make install DESTDIR=%{buildroot} INSTALL='install -p' + +# remove la file +find %{buildroot} -name '*.la' -exec rm -f {} ';' + +# FIXME: make sure debuginfo is generated properly (#795107) +chmod -c +x %{buildroot}%{_libdir}/xfce4/panel/plugins/*.so + %find_lang %{name} -rm -f %{buildroot}/%{_libdir}/xfce4/panel/plugins/libwavelan.la + %clean rm -rf %{buildroot} @@ -47,6 +62,11 @@ rm -rf %{buildroot} %{_datadir}/xfce4/panel/plugins/*.desktop %changelog +* Sat Jun 30 2012 Christoph Wickert <cwickert(a)fedoraproject.org> - 0.5.11-1 +- Update to 0.5.11 +- Define the Xfce version conditionally +- Add review # and VCS key + * Tue Apr 24 2012 Ville Skyttä <ville.skytta(a)iki.fi> - 0.5.10-2 - Fix -debuginfo.

1 0

[clamav/el6] Ship local copy of virus database; it was removed by accident from 0.97.5 tarball
by Robert Scheck 30 Jun '12

30 Jun '12

commit df3eb6be0d66e27aa8e51e09d87d08abd8a98c74 Author: Robert Scheck <robert(a)fedoraproject.org> Date: Sun Jul 1 01:47:19 2012 +0200 Ship local copy of virus database; it was removed by accident from 0.97.5 tarball .gitignore | 5 ++--- clamav.spec | 8 ++++++++ sources | 4 ++-- 3 files changed, 12 insertions(+), 5 deletions(-) --- diff --git a/.gitignore b/.gitignore index 916d9f6..23e3e8f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,4 @@ -/clamav-0.97.2-norar.tar.xz -/clamav-0.97.3.tar.gz /clamd-wrapper.tar.bz2 -/clamav-0.97.3-norar.tar.xz /clamav-0.97.5-norar.tar.xz +/main-54.cvd +/daily-15050.cvd diff --git a/clamav.spec b/clamav.spec index ee10cb8..2bc1881 100644 --- a/clamav.spec +++ b/clamav.spec @@ -22,6 +22,10 @@ Source8: freshclam.logrotate Source9: clamd.logrotate Source10: clamav-milter.sysconfig +# Temporary workaround for broken 0.97.5 tarball +Source11: http://db.local.clamav.net/main-54.cvd +Source12: http://db.local.clamav.net/daily-15050.cvd + BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: bzip2-devel, zlib-devel, gmp-devel, curl-devel, xz @@ -228,6 +232,9 @@ touch %{buildroot}%{_localstatedir}/log/clamav/clamd.log install -d -m0755 %{buildroot}%{_localstatedir}/run/clamav/ install -d -m0755 %{buildroot}%{_sysconfdir}/clamd.d/ +install -Dp -m0644 %{SOURCE11} %{buildroot}%{_localstatedir}/lib/clamav/main.cvd +install -Dp -m0644 %{SOURCE12} %{buildroot}%{_localstatedir}/lib/clamav/daily.cvd + %post /sbin/ldconfig @@ -383,6 +390,7 @@ rm -rf %{buildroot} - Fix CVE-2012-1443 clamav: specially-crafted RAR files evade detection - Fix CVE-2012-1458 clamav: specially-crafted CHM files evade detection - Fix CVE-2012-1459 clamav: specially-crafted length field in tar files evade detection +- Ship local copy of virus database; it was removed by accident from 0.97.5 tarball * Thu Jan 19 2012 Nick Bebout <nb(a)fedoraproject.org> - 0.97.3-4 - Split files out into SCM instead of in the spec diff --git a/sources b/sources index ec6a603..78cc194 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -f8e88e6adc82349e5babfa6ee7bb98fa clamav-0.97.5-norar.tar.xz -e809f74ed139df2e4af3fafbca32f678 clamd-wrapper.tar.bz2 +eb12490fda87d602e476d4b163f8a34b main-54.cvd +d41d8cd98f00b204e9800998ecf8427e daily-15050.cvd

1 0

File daily-15050.cvd uploaded to lookaside cache by robert
by Robert Scheck 30 Jun '12

30 Jun '12

A file has been added to the lookaside cache for clamav: d41d8cd98f00b204e9800998ecf8427e daily-15050.cvd

1 0

[xfce4-systemload-plugin/f17] (5 commits) ...Update to 1.1.1
by Christoph Wickert 30 Jun '12

30 Jun '12

Summary of changes: 76c50f4... Rebuild for Xfce 4.10 (*) 13f3b53... Rebuild for Xfce 4.10(pre2) (*) de33e4a... Update to 1.1.0 (*) 7e65b81... Fix -debuginfo. (*) f5e8ffc... Update to 1.1.1 (*) (*) This commit already existed in another branch; no separate mail sent

1 0

File xfce4-wavelan-plugin-0.5.11.tar.bz2 uploaded to lookaside cache by cwickert
by Christoph Wickert 30 Jun '12

30 Jun '12

A file has been added to the lookaside cache for xfce4-wavelan-plugin: 50514bb286f1ed6761a1b36832bb7fe3 xfce4-wavelan-plugin-0.5.11.tar.bz2

1 0

[clamav/el6] /var/clamav should be /var/lib/clamav (as it was somewhen in the past)
by Robert Scheck 30 Jun '12

30 Jun '12

commit c732ee62430052119672ccaba84b9651bdd673ca Author: Robert Scheck <robert(a)fedoraproject.org> Date: Sun Jul 1 01:25:02 2012 +0200 /var/clamav should be /var/lib/clamav (as it was somewhen in the past) clamav.spec | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) --- diff --git a/clamav.spec b/clamav.spec index 56f5aa7..ee10cb8 100644 --- a/clamav.spec +++ b/clamav.spec @@ -253,14 +253,14 @@ fi %pre getent group clam >/dev/null || groupadd -r clam getent passwd clam >/dev/null || \ -useradd -r -g clam -d /var/clamav -s /sbin/nologin \ +useradd -r -g clam -d /var/lib/clamav -s /sbin/nologin \ -c "Clam Anti Virus Checker" clam exit 0 %pre -n clamd getent group clam >/dev/null || groupadd -r clam getent passwd clam >/dev/null || \ -useradd -r -g clam -d /var/clamav -s /sbin/nologin \ +useradd -r -g clam -d /var/lib/clamav -s /sbin/nologin \ -c "Clam Anti Virus Checker" clam exit 0 @@ -291,7 +291,7 @@ fi %pre db getent group clam >/dev/null || groupadd -r clam getent passwd clam >/dev/null || \ -useradd -r -g clam -d /var/clamav -s /sbin/nologin \ +useradd -r -g clam -d /var/lib/clamav -s /sbin/nologin \ -c "Clam Anti Virus Checker" clam exit 0

1 0

[xfce4-systemload-plugin] Update to 1.1.1
by Christoph Wickert 30 Jun '12

30 Jun '12

commit f5e8ffcdb89f53227c8a34b63895a8b581ff1ef7 Author: Christoph Wickert <cwickert(a)fedoraproject.org> Date: Sun Jul 1 01:24:20 2012 +0200 Update to 1.1.1 - Enably power-saving interval option through upower .gitignore | 1 + sources | 2 +- xfce4-systemload-plugin.spec | 64 ++++++++++++++++++++++++++++-------------- 3 files changed, 45 insertions(+), 22 deletions(-) --- diff --git a/.gitignore b/.gitignore index c7db15e..eab7223 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ xfce4-systemload-plugin-0.4.2.tar.bz2 /xfce4-systemload-plugin-1.0.0.tar.bz2 /xfce4-systemload-plugin-1.1.0.tar.bz2 +/xfce4-systemload-plugin-1.1.1.tar.bz2 diff --git a/sources b/sources index a59fd94..3e15f7b 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -130ad7befddd8705ca09a98e9cee5c3e xfce4-systemload-plugin-1.1.0.tar.bz2 +22d48c0883f9d598bce24e81d93e692e xfce4-systemload-plugin-1.1.1.tar.bz2 diff --git a/xfce4-systemload-plugin.spec b/xfce4-systemload-plugin.spec index e053bd6..b59c550 100644 --- a/xfce4-systemload-plugin.spec +++ b/xfce4-systemload-plugin.spec @@ -1,50 +1,72 @@ -%global minor_version 1.1 - -Name: xfce4-systemload-plugin -Version: 1.1.0 -Release: 2%{?dist} -Summary: Systemload monitor for the Xfce panel - -Group: User Interface/Desktops -License: BSD -URL: http://goodies.xfce.org/projects/panel-plugins/%{name} -Source0: http://archive.xfce.org/src/panel-plugins/%{name}/%{minor_version}/%{name}-… -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -BuildRequires: xfce4-panel-devel >= 4.8.0 -BuildRequires: libxfce4ui-devel >= 4.8.0 -BuildRequires: libxml2-devel -BuildRequires: gettext, intltool -Requires: xfce4-panel >= 4.8.0 +# Review: https://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=173668 + +%global minorversion 1.1 +%if 0%{?fedora} >= 18 + %global xfceversion 4.10 +%else + %global xfceversion 4.8 +%endif + +Name: xfce4-systemload-plugin +Version: 1.1.1 +Release: 1%{?dist} +Summary: Systemload monitor for the Xfce panel + +Group: User Interface/Desktops +License: BSD +URL: http://goodies.xfce.org/projects/panel-plugins/%{name} +#VCS: git:git://git.xfce.org/panel-plugins/xfce4-systemload-plugin +Source0: http://archive.xfce.org/src/panel-plugins/%{name}/%{minorversion}/%{name}-%… +BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) + +BuildRequires: libxfce4ui-devel >= 4.7.0 +BuildRequires: xfce4-panel-devel >= 4.4.0 +BuildRequires: upower-devel +BuildRequires: gettext +BuildRequires: intltool +Requires: xfce4-panel >= %{xfceversion} %description A system-load monitor plugin for the Xfce panel. It displays the current CPU load, the memory in use, the swap space and the system uptime. + %prep %setup -q + %build %configure --disable-static make %{?_smp_mflags} + %install -rm -rf $RPM_BUILD_ROOT -make install DESTDIR=$RPM_BUILD_ROOT -chmod -c +x $RPM_BUILD_ROOT%{_libdir}/xfce4/panel/plugins/libsystemload.so +rm -rf %{buildroot} +make install DESTDIR=%{buildroot} INSTALL='install -p' + +# remove la file +find %{buildroot} -name '*.la' -exec rm -f {} ';' + +# FIXME: make sure debuginfo is generated properly (#795107) +chmod -c +x %{buildroot}%{_libdir}/xfce4/panel/plugins/*.so + %find_lang %{name} -rm -f $RPM_BUILD_ROOT/%{_libdir}/xfce4/panel/plugins/libsystemload.la + %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %files -f %{name}.lang %defattr(-,root,root,-) %doc AUTHORS COPYING ChangeLog NEWS README -%{_libdir}/xfce4/panel/plugins/libsystemload.so +%{_libdir}/xfce4/panel/plugins/*.so %{_datadir}/xfce4/panel/plugins/*.desktop %changelog +* Sat Jun 30 2012 Christoph Wickert <cwickert(a)fedoraproject.org> - 1.1.1-1 +- Update to 1.1.1 +- Enably power-saving interval option through upower + * Tue Apr 24 2012 Ville Skyttä <ville.skytta(a)iki.fi> - 1.1.0-2 - Fix -debuginfo.

1 0

[xfce4-fsguard-plugin/f17] (3 commits) ...Update to 1.0.1
by Christoph Wickert 30 Jun '12

30 Jun '12

Summary of changes: f5d1891... Rebuild for Xfce 4.10 (*) 47370eb... Rebuild for Xfce 4.10(pre2) (*) 2288774... Update to 1.0.1 (*) (*) This commit already existed in another branch; no separate mail sent

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

scm-commits June 2012