[packages/nagios-plugin-check_sip] rebuild with rpm5 dep generator
commit ac62568d3ee8ff8a1e2eb75bcd6aa459924e953c
Author: Elan Ruusamäe g...@delfi.ee
Date: Sat Jun 1 10:53:17 2013 +0300
rebuild with rpm5 dep generator
nagios-plugin-check_sip.spec | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/nagios-plugin-check_sip.spec b/nagios-plugin-check_sip.spec
index ca58bea..7a67955 100644
--- a/nagios-plugin-check_sip.spec
+++ b/nagios-plugin-check_sip.spec
@@ -3,13 +3,14 @@ Summary: Nagios plugin to check SIP server/device
Summary(pl.UTF-8): Wtyczka Nagiosa do sprawdzania urządzeń i serwerów SIP
Name: nagios-plugin-check_sip
Version: 1.3
-Release: 1
+Release: 2
License: GPL
Group: Networking
Source0:
http://www.bashton.com/downloads/nagios-check_sip-%{version}.tar.gz
# Source0-md5: 6bccc1b1fcd481df7065c6285aadbe25
URL: http://www.bashton.com/content/nagiosplugins
BuildRequires: rpm-perlprov = 4.1-13
+BuildRequires: rpmbuild(macros) = 1.654
Requires: nagios-core
Requires: nagios-plugins-libs
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -17,7 +18,7 @@ BuildRoot:%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%define_plugindir %{_libdir}/nagios/plugins
%define_sysconfdir /etc/nagios/plugins
-%define_noautoreq 'perl(utils)'
+%define_noautoreq_perl utils
%description
This plugin will test a SIP server/device for availability and
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/nagios-plugin-check_sip.git/commitdiff/ac62568d3ee8ff8a1e2eb75bcd6aa459924e953c
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/ghc-hashed-storage] - updated BRs - rel 2
commit aa64b14b86999be98b51bad1f13d55de6d40a788
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Sat Jun 1 09:54:06 2013 +0200
- updated BRs
- rel 2
ghc-hashed-storage.spec | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
---
diff --git a/ghc-hashed-storage.spec b/ghc-hashed-storage.spec
index beed8af..3fda2aa 100644
--- a/ghc-hashed-storage.spec
+++ b/ghc-hashed-storage.spec
@@ -2,7 +2,7 @@
Summary: Hashed file storage support code
Name: ghc-%{pkgname}
Version: 0.5.10
-Release: 1
+Release: 2
License: BSD
Group: Development/Languages
Source0:
http://hackage.haskell.org/packages/archive/%{pkgname}/%{version}/%{pkgname}-%{version}.tar.gz
@@ -10,6 +10,7 @@ Source0:
http://hackage.haskell.org/packages/archive/%{pkgname}/%{version}/%{pkg
URL: http://hackage.haskell.org/package/hashed-storage/
BuildRequires: ghc = 7.2
BuildRequires: ghc-dataenc
+BuildRequires: ghc-extensible-exceptions
BuildRequires: ghc-mmap = 1:0.5
BuildRequires: ghc-zlib
BuildRequires: rpmbuild(macros) = 1.608
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ghc-hashed-storage.git/commitdiff/aa64b14b86999be98b51bad1f13d55de6d40a788
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[projects/template-specs] rpm5 autodep generator defines
commit cfe7622a59576b6c03b43bb3e28e02e32b353b9a
Author: Elan Ruusamäe g...@delfi.ee
Date: Sat Jun 1 10:55:20 2013 +0300
rpm5 autodep generator defines
nagios-plugin.spec | 3 ++-
perl.spec | 4 +++-
2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/nagios-plugin.spec b/nagios-plugin.spec
index 8a2e128..f162a91 100644
--- a/nagios-plugin.spec
+++ b/nagios-plugin.spec
@@ -16,6 +16,7 @@ URL: -
# enable for Perl based plugins
#BuildRequires:perl-devel = 1:5.8.0
#BuildRequires:rpm-perlprov = 4.1-13
+#BuildRequires:rpmbuild(macros) = 1.654
Requires: nagios-common
# Requires:nagios-plugins-libs for utils.{sh,pm,php}, for Perl set
noautoreq for perl(utils)
#Requires: nagios-plugins-libs
@@ -23,7 +24,7 @@ BuildArch:noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
# for perl plugins:
-%define_noautoreq perl(utils)
+%define_noautoreq_perl utils
%define_sysconfdir /etc/nagios/plugins
%defineplugindir %{_prefix}/lib/nagios/plugins
diff --git a/perl.spec b/perl.spec
index 044b630..8afa261 100644
--- a/perl.spec
+++ b/perl.spec
@@ -28,6 +28,8 @@ Source0:
http://www.cpan.org/modules/by-module/PDIR/%{pdir}-%{pnam}-%{version}.t
Patch0:%{name}-foo.patch
# most of CPAN modules have generic URL (substitute pdir and pnam here)
URL: http://search.cpan.org/dist/PDIR-PNAM/
+# macros BR if _noautoreq_perl is used
+#BuildRequires:rpmbuild(macros) = 1.654
BuildRequires: perl-devel = 1:5.8.0
BuildRequires: rpm-perlprov = 4.1-13
BuildRequires: -
@@ -41,7 +43,7 @@ Obsoletes:-
BuildArch: noarch
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
-%define_noautoreq 'perl(anything_fake_or_conditional)'
+%define_noautoreq_perl anything_fake_or_conditional
%description
gitweb:
http://git.pld-linux.org/gitweb.cgi/projects/template-specs.git/commitdiff/cfe7622a59576b6c03b43bb3e28e02e32b353b9a
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SVN: rc-scripts/trunk/rc.d/rc.shutdown
Author: glen Date: Sat Jun 1 09:59:08 2013 New Revision: 12691 Modified: rc-scripts/trunk/rc.d/rc.shutdown Log: eval halt makes no sense, added in r574 doesn't give any clue either Modified: rc-scripts/trunk/rc.d/rc.shutdown == --- rc-scripts/trunk/rc.d/rc.shutdown (original) +++ rc-scripts/trunk/rc.d/rc.shutdown Sat Jun 1 09:59:08 2013 @@ -172,7 +172,7 @@ [ -x /sbin/poweroff-ups ] /sbin/poweroff-ups fi fi - [ $previous != unknown ] eval halt -d -p -f + [ $previous != unknown ] halt -d -p -f else show Please stand by while rebooting the $_rebootwhat; ok if [ -f /fastboot ]; then @@ -189,5 +189,5 @@ fail fi - [ $previous != unknown ] eval reboot -d -f + [ $previous != unknown ] reboot -d -f fi ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/ghc-haskell-src-meta] - update R - rel 3
commit 715674b738428c5d0bcd07a094c501089a9e0266
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Sat Jun 1 10:05:51 2013 +0200
- update R
- rel 3
ghc-haskell-src-meta.spec | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
---
diff --git a/ghc-haskell-src-meta.spec b/ghc-haskell-src-meta.spec
index e743a41..8bea1c9 100644
--- a/ghc-haskell-src-meta.spec
+++ b/ghc-haskell-src-meta.spec
@@ -2,7 +2,7 @@
Summary: Parse source to template-haskell abstract syntax
Name: ghc-%{pkgname}
Version: 0.6.0.2
-Release: 2
+Release: 3
License: BSD
Group: Development/Languages
Source0:
http://hackage.haskell.org/packages/archive/%{pkgname}/%{version}/%{pkgname}-%{version}.tar.gz
@@ -42,6 +42,7 @@ Requires: %{name} = %{version}-%{release}
Requires: ghc-haskell-platform-prof
Requires: ghc-haskell-src-exts-prof
Requires: ghc-th-lift-prof
+Requires: ghc-th-orphans-prof
%description prof
Profiling %{pkgname} library for GHC. Should be installed when
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ghc-haskell-src-meta.git/commitdiff/715674b738428c5d0bcd07a094c501089a9e0266
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/ghc-alex-meta] - updated files - rel 2
commit 7503d5a2ccf23cbfcca7838fb648978311e90cc1
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Sat Jun 1 10:07:52 2013 +0200
- updated files
- rel 2
ghc-alex-meta.spec | 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
---
diff --git a/ghc-alex-meta.spec b/ghc-alex-meta.spec
index a78cd0d..3799e86 100644
--- a/ghc-alex-meta.spec
+++ b/ghc-alex-meta.spec
@@ -2,7 +2,7 @@
Summary: Quasi-quoter for Alex lexers
Name: ghc-%{pkgname}
Version: 0.3.0.5
-Release: 1
+Release: 2
License: BSD
Group: Development/Languages
Source0:
http://hackage.haskell.org/packages/archive/%{pkgname}/%{version}/%{pkgname}-%{version}.tar.gz
@@ -85,6 +85,10 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/*.a
%exclude %{_libdir}/%{ghcdir}/%{pkgname}-%{version}/*_p.a
+%dir %{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Data
+%dir %{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Data/Ranged
+%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Data/*.hi
+%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Data/Ranged/*.hi
%dir %{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Text
%dir %{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Text/Alex
%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/*.hi
@@ -95,5 +99,7 @@ rm -rf $RPM_BUILD_ROOT
%defattr(644,root,root,755)
%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/*_p.a
%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/*.p_hi
+%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Data/*.p_hi
+%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Data/Ranged/*.p_hi
%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Text/*.p_hi
%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Text/Alex/*.p_hi
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ghc-alex-meta.git/commitdiff/7503d5a2ccf23cbfcca7838fb648978311e90cc1
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
SVN: rc-scripts/trunk/rc.d/rc.sysinit
Author: glen Date: Sat Jun 1 10:09:33 2013 New Revision: 12692 Modified: rc-scripts/trunk/rc.d/rc.sysinit Log: update comment to match code for stuffed statements in meanwhile Modified: rc-scripts/trunk/rc.d/rc.sysinit == --- rc-scripts/trunk/rc.d/rc.sysinit(original) +++ rc-scripts/trunk/rc.d/rc.sysinitSat Jun 1 10:09:33 2013 @@ -741,10 +741,10 @@ fi if ! is_no $DM_MULTIPATH [ -x /sbin/multipath ]; then - # first make nodes that were discarded due (possible) new /dev mount modprobe -s dm-mod - /sbin/dmsetup mknodes modprobe -s dm-multipath + # make nodes that were discarded due (possible) new /dev mount + /sbin/dmsetup mknodes run_cmd Activating dm-multipath /sbin/multipath -v 0 /sbin/dmsetup ls --target multipath --exec '/sbin/kpartx -a -p p' fi ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/ghc-haskell-src-meta] - updated files - rel 4
commit 79b7ce6d04413b6fb3f0424397fbc037dd1f4fc5
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Sat Jun 1 10:09:37 2013 +0200
- updated files
- rel 4
ghc-haskell-src-meta.spec | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/ghc-haskell-src-meta.spec b/ghc-haskell-src-meta.spec
index 8bea1c9..ee68427 100644
--- a/ghc-haskell-src-meta.spec
+++ b/ghc-haskell-src-meta.spec
@@ -2,7 +2,7 @@
Summary: Parse source to template-haskell abstract syntax
Name: ghc-%{pkgname}
Version: 0.6.0.2
-Release: 3
+Release: 4
License: BSD
Group: Development/Languages
Source0:
http://hackage.haskell.org/packages/archive/%{pkgname}/%{version}/%{pkgname}-%{version}.tar.gz
@@ -101,11 +101,13 @@ rm -rf $RPM_BUILD_ROOT
%dir %{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Language
%dir %{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Language/Haskell
%dir %{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Language/Haskell/Meta
+%dir %{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Language/Haskell/Meta/Parse
%dir %{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Language/Haskell/Meta/Syntax
%dir %{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Language/Haskell/TH
%dir %{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Language/Haskell/TH/Instances
%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Language/Haskell/*.hi
%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Language/Haskell/Meta/*.hi
+%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Language/Haskell/Meta/Parse/*.hi
%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Language/Haskell/Meta/Syntax/*.hi
%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Language/Haskell/TH/Instances/*.hi
@@ -114,5 +116,6 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/*_p.a
%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Language/Haskell/*.p_hi
%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Language/Haskell/Meta/*.p_hi
+%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Language/Haskell/Meta/Parse/*.p_hi
%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Language/Haskell/Meta/Syntax/*.p_hi
%{_libdir}/%{ghcdir}/%{pkgname}-%{version}/Language/Haskell/TH/Instances/*.p_hi
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ghc-haskell-src-meta.git/commitdiff/79b7ce6d04413b6fb3f0424397fbc037dd1f4fc5
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/mcelog] - up to 20130601 snap
commit 2b754dac8fc416022d85fabdca12aa328175da9b
Author: Arkadiusz Miśkiewicz ar...@maven.pl
Date: Sat Jun 1 11:07:03 2013 +0200
- up to 20130601 snap
bashism.patch | 13 +++--
manual.patch | 29 -
mcelog.spec | 19 +--
3 files changed, 16 insertions(+), 45 deletions(-)
---
diff --git a/mcelog.spec b/mcelog.spec
index 49c26f7..f6d54de 100644
--- a/mcelog.spec
+++ b/mcelog.spec
@@ -1,25 +1,25 @@
# TODO
# - sync pl
-%definesubver pre3
-%definerel 4
+%definesnap20130601
+%definerel 1
Summary: x86-64/x86 Machine Check Exceptions collector and decoder
Summary(pl.UTF-8): Narzędzie do zbierania i dekodowania wyjątków MCE na
platformie x86-64/x86
Name: mcelog
Version: 1.0
-Release: 0.%{subver}.%{rel}
+Release: 0.%{snap}.%{rel}
License: GPL v2
Group: Applications/System
-Source0:
http://www.kernel.org/pub/linux/utils/cpu/mce/%{name}-%{version}%{subver}.tar.gz
-# Source0-md5: b42f2214de6f4feb992556149edc67fa
+Source0: https://github.com/andikleen/mcelog/archive/master.zip
+# Source0-md5: 81f744e778cd170f68d03764633c4a31
Source1: %{name}.logrotate
Source2: %{name}.cron
Source3: %{name}.init
Source4: %{name}.sysconfig
Patch1:%{name}-FHS.patch
-Patch2:manual.patch
-Patch3:bashism.patch
-URL: http://www.mcelog.org/
+Patch2:bashism.patch
+URL: https://github.com/andikleen/mcelog.git
BuildRequires: rpmbuild(macros) = 1.228
+BuildRequires: unzip
Requires(post,preun): /sbin/chkconfig
Requires: rc-scripts
Suggests: crondaemon
@@ -60,10 +60,9 @@ który może być czytany z przestrzeni użytkownika poprzez
urządzenie
tych zdarzeń; loguje ono zdekodowane zdarzenia MCE do /var/log/mcelog.
%prep
-%setup -q -n %{name}-%{version}%{subver}
+%setup -q -n %{name}-master
%patch1 -p1
%patch2 -p1
-%patch3 -p1
%build
%{__make} \
diff --git a/bashism.patch b/bashism.patch
index 1804182..1ae9159 100644
--- a/bashism.patch
+++ b/bashism.patch
@@ -1,17 +1,18 @@
mcelog-1.0pre3/triggers/cache-error-trigger~ 2010-01-21
04:36:52.0 +0200
-+++ mcelog-1.0pre3/triggers/cache-error-trigger2010-08-10
13:40:29.531631113 +0300
+diff -urN mcelog-master.org/triggers/cache-error-trigger
mcelog-master/triggers/cache-error-trigger
+--- mcelog-master.org/triggers/cache-error-trigger 2013-05-03
01:03:26.0 +0200
mcelog-master/triggers/cache-error-trigger 2013-06-01 11:06:34.399817944
+0200
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
# cache error trigger. This shell script is executed by mcelog in daemon mode
# when a CPU reports excessive corrected cache errors. This could be a
indication
# for future uncorrected errors.
-@@ -25,7 +25,7 @@
+@@ -28,7 +28,7 @@
logger -s -p daemon.crit -t mcelog Offlining CPU $i due to cache error
threshold
F=$(printf /sys/devices/system/cpu/cpu%d/online $i)
echo 0 $F
-- if [ $( $F) != 0 ] then
-+ if [ $(cat $F) != 0 ] then
+- if [ $( $F) != 0 ] ; then
++ if [ $(cat $F) != 0 ] ; then
logger -s -p daemon.warn -t mcelog Offlining CPU $i failed
+ EXIT=1
fi
- done
diff --git a/manual.patch b/manual.patch
deleted file mode 100644
index 103cfe4..000
--- a/manual.patch
+++ /dev/null
@@ -1,29 +0,0 @@
mcelog-1.0pre3/mcelog.82010-08-10 12:47:10.342360355 +0300
-+++ mcelog-1.0pre3/mcelog.82010-08-10 12:48:29.041936982 +0300
-@@ -45,7 +45,7 @@
- Optionally it can also take more options like keeping statistics or
- triggering shell scripts on specific events.
-
--The normal operating modi for mcelog are running
-+The normal operating mode for mcelog is running
- as a regular cron job (traditional way, deprecated),
- running as a trigger directly executed by the kernel,
- or running as a daemon with the
-@@ -172,7 +172,7 @@
- .B \-\-config-file file
- option mcelog reads the specified config file.
- Default is
--.I /etc/mcelog.conf
-+.I /etc/mcelog/mcelog.conf
- See also
- .I CONFIG FILE
- below.
-@@ -245,7 +245,7 @@
- .SH CONFIG FILE
- mcelog supports a config file to set defaults. Command line options override
- the config file. By default the config file is read from
--.I /etc/mcelog.conf
-+.I /etc/mcelog/mcelog.conf
- unless overridden with the
- .I --config-file
- option.
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/mcelog.git/commitdiff/2b754dac8fc416022d85fabdca12aa328175da9b
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: mcelog: master.zip
Files fetched: 1 STORED: https://github.com/andikleen/mcelog/archive/master.zip 81f744e778cd170f68d03764633c4a31 master.zip Size: 324710 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/mcelog] - bump rel
commit f4c9e848fd0b89daa8ae008e45f751bbb024becb
Author: Arkadiusz Miśkiewicz ar...@maven.pl
Date: Sat Jun 1 11:08:04 2013 +0200
- bump rel
mcelog.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/mcelog.spec b/mcelog.spec
index f6d54de..0388156 100644
--- a/mcelog.spec
+++ b/mcelog.spec
@@ -6,7 +6,7 @@ Summary:x86-64/x86 Machine Check Exceptions collector
and decoder
Summary(pl.UTF-8): Narzędzie do zbierania i dekodowania wyjątków MCE na
platformie x86-64/x86
Name: mcelog
Version: 1.0
-Release: 0.%{snap}.%{rel}
+Release: 1.%{snap}.%{rel}
License: GPL v2
Group: Applications/System
Source0: https://github.com/andikleen/mcelog/archive/master.zip
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/mcelog.git/commitdiff/f4c9e848fd0b89daa8ae008e45f751bbb024becb
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/ganeti] - removed template loftovers - list files
commit 7adb0d043b42d7fc77b96ef47d224eb523ca26e4
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Sat Jun 1 11:30:06 2013 +0200
- removed template loftovers
- list files
ganeti.spec | 161 ++--
ganeti.tmpfiles | 1 +
2 files changed, 100 insertions(+), 62 deletions(-)
---
diff --git a/ganeti.spec b/ganeti.spec
index b0bab20..a03186c 100644
--- a/ganeti.spec
+++ b/ganeti.spec
@@ -6,6 +6,7 @@ License:GPL v2
Group: Applications/System
Source0: https://ganeti.googlecode.com/files/%{name}-%{version}.tar.gz
# Source0-md5: 9d9a0c5c0341d5775988961449f82b99
+Source1: %{name}.tmpfiles
URL: https://code.google.com/p/ganeti/
BuildRequires: fakeroot
BuildRequires: gawk
@@ -29,20 +30,9 @@ BuildRequires: rpmbuild(macros) = 1.228
Requires(post,preun): /sbin/chkconfig
Requires: rc-scripts
%endif
-%if %{with systemd_service}
BuildRequires: rpmbuild(macros) = 1.647
Requires(post,preun,postun): systemd-units = 38
Requires: systemd-units = 0.38
-%endif
-#BuildRequires:-
-#BuildRequires:autoconf
-#BuildRequires:automake
-#BuildRequires:intltool
-#BuildRequires:libtool
-#Requires(postun): -
-#Requires(pre,post): -
-#Requires(preun): -
-#Requires: -
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -63,42 +53,6 @@ BuildArch: noarch
%description subpackage -l pl.UTF-8
-%package libs
-Summary: -
-Summary(pl.UTF-8): -
-Group: Libraries
-
-%description libs
-
-%description libs -l pl.UTF-8
-
-%package devel
-Summary: Header files for %{name} library
-Summary(pl.UTF-8): Pliki nagłówkowe biblioteki %{name}
-Group: Development/Libraries
-# if base package contains shared library for which these headers are
-#Requires: %{name} = %{version}-%{release}
-# if -libs package contains shared library for which these headers are
-#Requires: %{name}-libs = %{version}-%{release}
-
-%description devel
-Header files for %{name} library.
-
-%description devel -l pl.UTF-8
-Pliki nagłówkowe biblioteki %{name}.
-
-%package static
-Summary: Static %{name} library
-Summary(pl.UTF-8): Statyczna biblioteka %{name}
-Group: Development/Libraries
-Requires: %{name}-devel = %{version}-%{release}
-
-%description static
-Static %{name} library.
-
-%description static -l pl.UTF-8
-Statyczna biblioteka %{name}.
-
%prep
%setup -q
@@ -124,15 +78,17 @@ Statyczna biblioteka %{name}.
%install
rm -rf $RPM_BUILD_ROOT
+install -d $RPM_BUILD_ROOT%{systemdtmpfilesdir}
%if %{with initscript}
install -d $RPM_BUILD_ROOT/etc/{sysconfig,rc.d/init.d}
%endif
-#install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
+install %{SOURCE1} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/ganeti.conf
+
%clean
rm -rf $RPM_BUILD_ROOT
@@ -140,21 +96,12 @@ rm -rf $RPM_BUILD_ROOT
%groupadd -g xxx %{name}
%useradd -u xxx -d /var/lib/%{name} -g %{name} -c XXX User %{name}
-%post
-
-%preun
-
%postun
if [ $1 = 0 ]; then
%userremove %{name}
%groupremove %{name}
fi
-%if %{with ldconfig}
-%post -p /sbin/ldconfig
-%postun-p /sbin/ldconfig
-%endif
-
%if %{with initscript}
%post
/sbin/chkconfig --add %{name}
@@ -180,14 +127,106 @@ fi
%files
%defattr(644,root,root,755)
-%doc AUTHORS CREDITS CHANGES ChangeLog NEWS README THANKS TODO
+%doc NEWS README UPGRADE
+%{systemdtmpfilesdir}/ganeti.conf
+%{_bindir}/hbal
+%{_bindir}/hcheck
+%{_bindir}/hinfo
+%{_bindir}/hscan
+%{_bindir}/hspace
+%{_bindir}/htools
+%dir %{_libdir}/ganeti
+%{_libdir}/ganeti/check-cert-expired
+%{_libdir}/ganeti/daemon-util
+%{_libdir}/ganeti/ensure-dirs
+%dir %{_libdir}/ganeti/iallocators
+%{_libdir}/ganeti/iallocators/hail
+%{_libdir}/ganeti/import-export
+%{_libdir}/ganeti/kvm-ifup
+%dir %{_libdir}/ganeti/tools
+%{_libdir}/ganeti/tools/burnin
+%{_libdir}/ganeti/tools/cfgshell
+%{_libdir}/ganeti/tools/cfgupgrade
+%{_libdir}/ganeti/tools/cfgupgrade12
+%{_libdir}/ganeti/tools/cluster-merge
+%{_libdir}/ganeti/tools/confd-client
+%{_libdir}/ganeti/tools/fmtjson
+%{_libdir}/ganeti/tools/kvm-console-wrapper
+%{_libdir}/ganeti/tools/lvmstrap
+%{_libdir}/ganeti/tools/master-ip-setup
+%{_libdir}/ganeti/tools/move-instance
+%{_libdir}/ganeti/tools/ovfconverter
+%{_libdir}/ganeti/tools/sanitize-config
+%{_libdir}/ganeti/tools/setup-ssh
+%{_libdir}/ganeti/tools/xen-console-wrapper
+%attr(755,root,root) %{_sbindir}/ganeti-cleaner
+%attr(755,root,root) %{_sbindir}/ganeti-confd
+%attr(755,root,root) %{_sbindir}/ganeti-listrunner
+%attr(755,root,root) %{_sbindir}/ganeti-masterd
+%attr(755,root,root) %{_sbindir}/ganeti-noded
+%attr(755,root,root) %{_sbindir}/ganeti-rapi
+%attr(755,root,root) %{_sbindir}/ganeti-watcher
+%attr(755,root,root) %{_sbindir}/gnt-backup
+%attr(755,root,root) %{_sbindir}/gnt-cluster
+%attr(755,root,root)
[packages/ganeti] - fix upstream obsolete kvm option bug - added htools subpackage
commit 554d0f8c6ddabc55c8cd9c34120ceb836c00968e
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Sat Jun 1 12:21:11 2013 +0200
- fix upstream obsolete kvm option bug
- added htools subpackage
fix-no-kvm.patch | 17
ganeti.spec | 60
2 files changed, 47 insertions(+), 30 deletions(-)
---
diff --git a/ganeti.spec b/ganeti.spec
index a03186c..e41b9e5 100644
--- a/ganeti.spec
+++ b/ganeti.spec
@@ -7,6 +7,7 @@ Group: Applications/System
Source0: https://ganeti.googlecode.com/files/%{name}-%{version}.tar.gz
# Source0-md5: 9d9a0c5c0341d5775988961449f82b99
Source1: %{name}.tmpfiles
+Patch0:fix-no-kvm.patch
URL: https://code.google.com/p/ganeti/
BuildRequires: fakeroot
BuildRequires: gawk
@@ -40,21 +41,24 @@ Ganeti is a cluster virtual server management software tool
built on
top of existing virtualization technologies such as Xen or KVM and
other Open Source software.
-%package subpackage
-Summary: -
-Summary(pl.UTF-8): -
-Group: -
-# noarch subpackages only when building with rpm5
-%if %{_rpmversion} = 5
-BuildArch: noarch
-%endif
+%package htools
+Summary: Cluster allocation tools for Ganeti
+Group: Applications/System
+Requires: %{name} = %{version}-%{release}
-%description subpackage
+%description htools
+These are additional tools used for enhanced allocation and capacity
+calculation on Ganeti clusters.
-%description subpackage -l pl.UTF-8
+The tools provided are:
+ - hail, an iallocator script for ganeti
+ - hbal, used to redistribute instances on the cluster
+ - hspace, used for capacity calculation
+ - hscan, used to gather cluster files for offline use in hbal/hspace
%prep
%setup -q
+%patch0 -p1
%build
# DON'T use full path to xl binary, just 'xl' (see lib/hypervisor/hv_xen.py
for a reason)
@@ -129,18 +133,10 @@ fi
%defattr(644,root,root,755)
%doc NEWS README UPGRADE
%{systemdtmpfilesdir}/ganeti.conf
-%{_bindir}/hbal
-%{_bindir}/hcheck
-%{_bindir}/hinfo
-%{_bindir}/hscan
-%{_bindir}/hspace
-%{_bindir}/htools
%dir %{_libdir}/ganeti
%{_libdir}/ganeti/check-cert-expired
%{_libdir}/ganeti/daemon-util
%{_libdir}/ganeti/ensure-dirs
-%dir %{_libdir}/ganeti/iallocators
-%{_libdir}/ganeti/iallocators/hail
%{_libdir}/ganeti/import-export
%{_libdir}/ganeti/kvm-ifup
%dir %{_libdir}/ganeti/tools
@@ -174,13 +170,6 @@ fi
%attr(755,root,root) %{_sbindir}/gnt-job
%attr(755,root,root) %{_sbindir}/gnt-node
%attr(755,root,root) %{_sbindir}/gnt-os
-%{_mandir}/man1/hail.1*
-%{_mandir}/man1/hbal.1*
-%{_mandir}/man1/hcheck.1*
-%{_mandir}/man1/hinfo.1*
-%{_mandir}/man1/hscan.1*
-%{_mandir}/man1/hspace.1*
-%{_mandir}/man1/htools.1*
%{_mandir}/man7/ganeti-os-interface.7*
%{_mandir}/man7/ganeti.7*
%{_mandir}/man8/ganeti-cleaner.8*
@@ -239,9 +228,20 @@ fi
%{systemdunitdir}/%{name}.service
%endif
-%if %{with subpackage}
-%files subpackage
+%files htools
%defattr(644,root,root,755)
-#%doc extras/*.gz
-#%{_datadir}/%{name}-ext
-%endif
+%{_bindir}/hbal
+%{_bindir}/hcheck
+%{_bindir}/hinfo
+%{_bindir}/hscan
+%{_bindir}/hspace
+%{_bindir}/htools
+%dir %{_libdir}/ganeti/iallocators
+%{_libdir}/ganeti/iallocators/hail
+%{_mandir}/man1/hail.1*
+%{_mandir}/man1/hbal.1*
+%{_mandir}/man1/hcheck.1*
+%{_mandir}/man1/hinfo.1*
+%{_mandir}/man1/hscan.1*
+%{_mandir}/man1/hspace.1*
+%{_mandir}/man1/htools.1*
diff --git a/fix-no-kvm.patch b/fix-no-kvm.patch
new file mode 100644
index 000..1768e68
--- /dev/null
+++ b/fix-no-kvm.patch
@@ -0,0 +1,17 @@
+Author: Iustin Pop ius...@debian.org
+Description: Fix obsolete -disable-kvm usage
+ This is already a bug upstream, but pending proper fixing (per version keying,
+ etc.), let's just use the correct version that will be shipped in Wheezy.
+Bug: https://code.google.com/p/ganeti/issues/detail?id=250
+Last-Update: 2012-07-26
+--- a/lib/hypervisor/hv_kvm.py
b/lib/hypervisor/hv_kvm.py
+@@ -554,7 +554,7 @@
+ if hvp[constants.HV_KVM_FLAG] == constants.HT_KVM_ENABLED:
+ kvm_cmd.extend([-enable-kvm])
+ elif hvp[constants.HV_KVM_FLAG] == constants.HT_KVM_DISABLED:
+- kvm_cmd.extend([-disable-kvm])
++ kvm_cmd.extend([-no-kvm])
+
+ if boot_network:
+ kvm_cmd.extend([-boot, n])
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ganeti.git/commitdiff/554d0f8c6ddabc55c8cd9c34120ceb836c00968e
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/ganeti] - prepare for init script
commit 43241b1486748d37363daa1792a969b19ff94d78
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Sat Jun 1 14:19:09 2013 +0200
- prepare for init script
ganeti.spec | 57 +
1 file changed, 21 insertions(+), 36 deletions(-)
---
diff --git a/ganeti.spec b/ganeti.spec
index e41b9e5..9efaf0e 100644
--- a/ganeti.spec
+++ b/ganeti.spec
@@ -26,13 +26,13 @@ BuildRequires: python-pycurl
BuildRequires: python-pyinotify
BuildRequires: python-pyparsing
BuildRequires: python-simplejson
-%if %{with initscript}
-BuildRequires: rpmbuild(macros) = 1.228
-Requires(post,preun): /sbin/chkconfig
-Requires: rc-scripts
-%endif
+BuildRequires: python-devel
+BuildRequires: python-distribute
+BuildRequires: rpm-pythonprov
BuildRequires: rpmbuild(macros) = 1.647
+Requires(post,preun): /sbin/chkconfig
Requires(post,preun,postun): systemd-units = 38
+Requires: rc-scripts
Requires: systemd-units = 0.38
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -82,20 +82,20 @@ The tools provided are:
%install
rm -rf $RPM_BUILD_ROOT
-install -d $RPM_BUILD_ROOT%{systemdtmpfilesdir}
-
-%if %{with initscript}
-install -d $RPM_BUILD_ROOT/etc/{sysconfig,rc.d/init.d}
-%endif
+install -d $RPM_BUILD_ROOT{%{systemdunitdir},%{systemdtmpfilesdir}} \
+ $RPM_BUILD_ROOT/etc/{sysconfig,rc.d/init.d}
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
install %{SOURCE1} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/ganeti.conf
+%py_postclean
+
%clean
rm -rf $RPM_BUILD_ROOT
+%if 0
%pre
%groupadd -g xxx %{name}
%useradd -u xxx -d /var/lib/%{name} -g %{name} -c XXX User %{name}
@@ -105,40 +105,42 @@ if [ $1 = 0 ]; then
%userremove %{name}
%groupremove %{name}
fi
+%endif
-%if %{with initscript}
%post
/sbin/chkconfig --add %{name}
%service %{name} restart
+%systemd_post %{name}.service
%preun
if [ $1 = 0 ]; then
%service -q %{name} stop
/sbin/chkconfig --del %{name}
fi
-%endif
-
-%if %{with systemd_service}
-%post
-%systemd_post %{name}.service
-
-%preun
%systemd_preun %{name}.service
%postun
%systemd_reload
-%endif
%files
%defattr(644,root,root,755)
%doc NEWS README UPGRADE
+%attr(754,root,root) /etc/rc.d/init.d/%{name}
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{name}
+%{systemdunitdir}/%{name}.service
%{systemdtmpfilesdir}/ganeti.conf
+%if 0
+# if _sysconfdir != /etc:
+#%%dir %{_sysconfdir}
+%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*
+%endif
%dir %{_libdir}/ganeti
%{_libdir}/ganeti/check-cert-expired
%{_libdir}/ganeti/daemon-util
%{_libdir}/ganeti/ensure-dirs
%{_libdir}/ganeti/import-export
%{_libdir}/ganeti/kvm-ifup
+%dir %{_libdir}/ganeti/iallocators
%dir %{_libdir}/ganeti/tools
%{_libdir}/ganeti/tools/burnin
%{_libdir}/ganeti/tools/cfgshell
@@ -212,22 +214,6 @@ fi
%dir %{py_sitescriptdir}/ganeti/watcher
%{py_sitescriptdir}/ganeti/watcher/*.py*
-%if 0
-# if _sysconfdir != /etc:
-#%%dir %{_sysconfdir}
-%config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/*
-%endif
-
-# initscript and its config
-%if %{with initscript}
-%attr(754,root,root) /etc/rc.d/init.d/%{name}
-%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{name}
-%endif
-
-%if %{with systemd_service}
-%{systemdunitdir}/%{name}.service
-%endif
-
%files htools
%defattr(644,root,root,755)
%{_bindir}/hbal
@@ -236,7 +222,6 @@ fi
%{_bindir}/hscan
%{_bindir}/hspace
%{_bindir}/htools
-%dir %{_libdir}/ganeti/iallocators
%{_libdir}/ganeti/iallocators/hail
%{_mandir}/man1/hail.1*
%{_mandir}/man1/hbal.1*
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ganeti.git/commitdiff/43241b1486748d37363daa1792a969b19ff94d78
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
PLD-doc: PLD-update-TODO - updated
Author: arekmDate: Sat Jun 1 15:37:26 2013 GMT Module: PLD-doc Tag: HEAD Log message: - updated Files affected: PLD-doc: PLD-update-TODO (1.1571 - 1.1572) Diffs: Index: PLD-doc/PLD-update-TODO diff -u PLD-doc/PLD-update-TODO:1.1571 PLD-doc/PLD-update-TODO:1.1572 --- PLD-doc/PLD-update-TODO:1.1571 Thu May 30 09:23:49 2013 +++ PLD-doc/PLD-update-TODO Sat Jun 1 17:37:21 2013 @@ -5,6 +5,7 @@ Gorm(8) [OLD] 1.2.8 [NEW] 1.2.20 IRRToolSet(8) [OLD] 4.8.5 [NEW] 5.0.1 SPECS/LiVES.spec:28: impossible substitution: http://www.xs4all.nl/%7Esalsaman/lives/current/LiVES-0.9.8.7.tar.bz2 +ModemManager(8) [OLD] 0.6.0.0 [NEW] 0.6.2.0 Mowitz(8) [OLD] 0.3.0 [NEW] 0.3.1 NewsFeed(10) [OLD] 2.14 [NEW] 3.0 OSPToolkit(8) [OLD] 3.6.1 [NEW] 4.1.4 @@ -64,7 +65,7 @@ asn1c(8) [OLD] 0.9.21 [NEW] 0.9.24 aspectj(8) [OLD] 1.6.0 [NEW] 1.7.2.20120920133900 aspell-ca(11) [OLD] 2.1.5 [NEW] 20040130 -aspell-pl-alt(8) [OLD] 20121228 [NEW] 20130529 +aspell-pl-alt(8) [OLD] 20121228 [NEW] 20130601 asterisk-chan_capi(9) [OLD] 1.1.5 [NEW] 1.1.6 asterisk-perl(13) [OLD] 0.10 [NEW] 1.03 asterisk-sounds-core(48) [OLD] 1.4.21 [NEW] 1.4.24 @@ -72,6 +73,7 @@ asterisk(45) [OLD] 10.12.2 [NEW] 11.4.0 asunder(8) [OLD] 2.2 [NEW] 2.3 attr(8) [OLD] 2.4.46 [NEW] 2.4.47 +audit(23) [OLD] 2.3 [NEW] 2.3.1 authconfig(14) [OLD] 6.2.2 [NEW] 6.2.5 autoconf2_13(17) [OLD] 2.13 [NEW] 2.69 autofs(20) [OLD] 5.0.5 [NEW] 5.0.7 @@ -90,9 +92,8 @@ bibclean(11) [OLD] 2.11.4 [NEW] 2.11.4.updates billiards(8) [OLD] 0.4 [NEW] 0.4.1 binwalk(7) [OLD] 0.3.8 [NEW] 1.2.1 -bitcoin(7) [OLD] 0.8.1 [NEW] 0.8.2 bitlbee(15) [OLD] 3.0.6 [NEW] 3.2 -blender(11) [OLD] 2.49b [NEW] 2.67a +blender(11) [OLD] 2.49b [NEW] 2.67b bless(8) [OLD] 0.4.1 [NEW] 0.6.0 bluefish(10) [OLD] 2.2.2 [NEW] 2.2.4 bongo(8) [OLD] 0.2.0 [NEW] 0.6.1 @@ -103,6 +104,7 @@ bttv(19) [OLD] 0.7.87 [NEW] 0.9.15 bucardo(10) [OLD] 4.4.0 [NEW] 4.99.7 bugzilla(12) [OLD] 3.3.3 [NEW] 4.4 +buildroot(7) [OLD] 2013.02 [NEW] 2013.05 busybox(44) [OLD] 1.20.2 [NEW] 1.21.0 bzr-gtk(14) [OLD] 0.99.1 [NEW] 0.103.0 bzr-svn(8) [OLD] 1.0.4 [NEW] 1.2.3 @@ -122,7 +124,7 @@ ceph(13) [OLD] 0.60 [NEW] 0.63 cfl(8) [OLD] 0.8.0 [NEW] 1.1 cgames(8) [OLD] 2.2 [NEW] 2.2a -cgminer(8) [OLD] 3.1.0 [NEW] 3.1.1 +cgminer(8) [OLD] 3.1.0 [NEW] 3.2.0 cgterm(8) [OLD] 1.6 [NEW] 1.7b2 chatzilla(8) [OLD] 0.9.86.1 [NEW] 0.9.90 chmsee(8) [OLD] 1.3.0 [NEW] 2.0.1 @@ -138,29 +140,29 @@ SPECS/cnmonitor.spec:9: impossible substitution: http://dl.sourceforge.net/project/cnmonitor/CN%3DMonitor/1.3/cnmonitor-1.3-3.tgz collectd(74) [OLD] 5.1.0 [NEW] 5.3.0 comparator(8) [OLD] 2.8 [NEW] 2.9 -compat-gcc-34(12) [OLD] 3.4.6 [NEW] 4.8.0 -connman(8) [OLD] 1.13 [NEW] 1.14 +compat-gcc-34(12) [OLD] 3.4.6 [NEW] 4.8.1 +connman(8) [OLD] 1.13 [NEW] 1.15 coq(16) [OLD] 8.3pl1 [NEW] 84 corosync(19) [OLD] 2.2.0 [NEW] 2.3.0 crossalpha-binutils(12) [OLD] 2.17.50.0.3 [NEW] 2.23.52.0.2 -crossalpha-gcc(13) [OLD] 4.1.1 [NEW] 4.8.0 +crossalpha-gcc(13) [OLD] 4.1.1 [NEW] 4.8.1 crossarm-binutils(16) [OLD] 2.18.50.0.2 [NEW] 2.23.52.0.2 -crossarm-gcc(21) [OLD] 4.2.2 [NEW] 4.8.0 +crossarm-gcc(21) [OLD] 4.2.2 [NEW] 4.8.1 crossarm-newlib(8) [OLD] 1.12.0 [NEW] 1.20.0 crossavr-binutils(64) [OLD] 2.22 [NEW] 2.23.2 -crossavr-gcc(79) [OLD] 4.6.2 [NEW] 4.8.0 +crossavr-gcc(79) [OLD] 4.6.2 [NEW] 4.8.1 crossavr32-binutils(12) [OLD] 2.17 [NEW] 2.23.2 -crossavr32-gcc(17) [OLD] 4.2.1 [NEW] 4.8.0 +crossavr32-gcc(17) [OLD] 4.2.1 [NEW] 4.8.1 crossdjgpp-binutils(12) [OLD] 2.15.91.0.1 [NEW] 2.23.52.0.2 -crossdjgpp-gcc(13) [OLD] 3.3.2 [NEW] 4.8.0 +crossdjgpp-gcc(13) [OLD] 3.3.2 [NEW] 4.8.1 crossdjgpp-pdcurses(9) [OLD] 24 [NEW] 34 crosshppa-binutils(12) [OLD] 2.15.91.0.1 [NEW] 2.23.52.0.2 -crosshppa-gcc(12) [OLD] 3.3.6 [NEW] 4.8.0 +crosshppa-gcc(12) [OLD] 3.3.6 [NEW] 4.8.1 crossm68k-binutils(16) [OLD] 2.17.50.0.14 [NEW] 2.23.52.0.2 -crossm68k-gcc(13) [OLD] 3.3.6 [NEW] 4.8.0 +crossm68k-gcc(13) [OLD] 3.3.6 [NEW] 4.8.1 crossm68k-uClibc(16) [OLD] 0.9.27 [NEW] 0.9.33.2 crossmingw32-evil(8) [OLD] 1.7.6 [NEW] 1.7.7 -crossmingw32-gcc(20) [OLD] 4.7.3 [NEW] 4.8.0 +crossmingw32-gcc(20) [OLD] 4.7.3 [NEW] 4.8.1 crossmingw32-glibmm(9) [OLD] 2.36.0 [NEW] 2.36.2 crossmingw32-harfbuzz(8) [OLD] 0.9.17 [NEW] 0.9.18 crossmingw32-lua40(9) [OLD] 4.0.1 [NEW] 5.2.2 @@ -169,26 +171,28 @@ crossmingw32-tolua++(9) [OLD] 1.0.4 [NEW] 1.0.93 crossmingw32-xz(8) [OLD] 5.0.4 [NEW] 5.1.2alpha crossmingw64-binutils(12) [OLD] 2.23.51.0.8 [NEW] 2.23.52.0.2 -crossmingw64-gcc(17) [OLD] 4.7.2 [NEW] 4.8.0 +crossmingw64-gcc(17) [OLD] 4.7.2 [NEW] 4.8.1 crossmipsel-binutils(12) [OLD] 2.20.51.0.5 [NEW] 2.23.52.0.2 crossmipsel-egcs(10) [OLD] 1.0.2 [NEW] 1.1.2 -crossmipsel-gcc(13) [OLD] 3.4.6 [NEW] 4.8.0 +crossmipsel-gcc(13) [OLD] 3.4.6 [NEW] 4.8.1 crossmipsel-uClibc(12) [OLD] 0.9.28 [NEW] 0.9.33.2 crossppc-binutils(14) [OLD] 2.20.51.0.3 [NEW] 2.23.52.0.2 -crossppc-gcc(17) [OLD
[packages/apache-mod_fastcgi] Add patch to compile with Apache 2.4
commit 70bfa08987b9a93d0ada00100f9ffb865ad8bd6f
Author: Aria aredri...@nbtsc.org
Date: Wed May 29 05:14:35 2013 -0600
Add patch to compile with Apache 2.4
apache-mod_fastcgi-apache24.patch | 137 ++
apache-mod_fastcgi.spec | 2 +-
2 files changed, 138 insertions(+), 1 deletion(-)
---
diff --git a/apache-mod_fastcgi.spec b/apache-mod_fastcgi.spec
index d70d7d5..45061a2 100644
--- a/apache-mod_fastcgi.spec
+++ b/apache-mod_fastcgi.spec
@@ -17,7 +17,7 @@ Patch0: %{name}-allow-uid-gid.patch
Patch1:%{name}-socketdir.patch
Patch2:%{name}-stderr-buf.patch
Patch3:%{name}-segv-onload.patch
-Patch4:%{name}-apache22.patch
+Patch4:%{name}-apache24.patch
URL: http://www.fastcgi.com/
BuildRequires: %{apxs}
BuildRequires: apache-devel = 2.2
diff --git a/apache-mod_fastcgi-apache24.patch
b/apache-mod_fastcgi-apache24.patch
new file mode 100644
index 000..417c03e
--- /dev/null
+++ b/apache-mod_fastcgi-apache24.patch
@@ -0,0 +1,137 @@
+Index: libapache-mod-fastcgi/fcgi.h
+===
+--- libapache-mod-fastcgi.orig/fcgi.h 2012-03-07 14:29:04.005720240 +0100
libapache-mod-fastcgi/fcgi.h 2012-03-07 14:29:07.830566657 +0100
+@@ -34,6 +34,10 @@
+ #define APACHE2
+ #endif
+
++#ifdef AP_DECLARE_MODULE
++#define APACHE24
++#endif
++
+ #ifdef APACHE2
+
+ #include sys/stat.h
+@@ -57,10 +61,16 @@
+ #define XtOffsetOf APR_OFFSETOF
+ #define ap_select select
+
++#ifdef APACHE24
++#define unixd_config ap_unixd_config
++#endif
++
++#ifdef APACHE2
+ #define ap_user_idunixd_config.user_id
+ #define ap_group_id unixd_config.group_id
+ #define ap_user_name unixd_config.user_name
+ #define ap_suexec_enabled unixd_config.suexec_enabled
++#endif
+
+ #ifndef S_ISDIR
+ #define S_ISDIR(m) (((m)(S_IFMT)) == (S_IFDIR))
+@@ -365,42 +375,42 @@
+ #ifdef APACHE2
+
+ #ifdef WIN32
+-#define FCGI_LOG_EMERG
__FILE__,__LINE__,APLOG_EMERG,APR_FROM_OS_ERROR(GetLastError())
+-#define FCGI_LOG_ALERT
__FILE__,__LINE__,APLOG_ALERT,APR_FROM_OS_ERROR(GetLastError())
+-#define FCGI_LOG_CRIT
__FILE__,__LINE__,APLOG_CRIT,APR_FROM_OS_ERROR(GetLastError())
+-#define FCGI_LOG_ERR
__FILE__,__LINE__,APLOG_ERR,APR_FROM_OS_ERROR(GetLastError())
+-#define FCGI_LOG_WARN
__FILE__,__LINE__,APLOG_WARNING,APR_FROM_OS_ERROR(GetLastError())
+-#define FCGI_LOG_NOTICE
__FILE__,__LINE__,APLOG_NOTICE,APR_FROM_OS_ERROR(GetLastError())
+-#define FCGI_LOG_INFO
__FILE__,__LINE__,APLOG_INFO,APR_FROM_OS_ERROR(GetLastError())
+-#define FCGI_LOG_DEBUG
__FILE__,__LINE__,APLOG_DEBUG,APR_FROM_OS_ERROR(GetLastError())
++#define FCGI_LOG_EMERG
APLOG_MARK,APLOG_EMERG,APR_FROM_OS_ERROR(GetLastError())
++#define FCGI_LOG_ALERT
APLOG_MARK,APLOG_ALERT,APR_FROM_OS_ERROR(GetLastError())
++#define FCGI_LOG_CRIT
APLOG_MARK,APLOG_CRIT,APR_FROM_OS_ERROR(GetLastError())
++#define FCGI_LOG_ERR
APLOG_MARK,APLOG_ERR,APR_FROM_OS_ERROR(GetLastError())
++#define FCGI_LOG_WARN
APLOG_MARK,APLOG_WARNING,APR_FROM_OS_ERROR(GetLastError())
++#define FCGI_LOG_NOTICE
APLOG_MARK,APLOG_NOTICE,APR_FROM_OS_ERROR(GetLastError())
++#define FCGI_LOG_INFO
APLOG_MARK,APLOG_INFO,APR_FROM_OS_ERROR(GetLastError())
++#define FCGI_LOG_DEBUG
APLOG_MARK,APLOG_DEBUG,APR_FROM_OS_ERROR(GetLastError())
+ #else /* !WIN32 */
+-#define FCGI_LOG_EMERG
__FILE__,__LINE__,APLOG_EMERG,APR_FROM_OS_ERROR(errno)
+-#define FCGI_LOG_ALERT
__FILE__,__LINE__,APLOG_ALERT,APR_FROM_OS_ERROR(errno)
+-#define FCGI_LOG_CRIT
__FILE__,__LINE__,APLOG_CRIT,APR_FROM_OS_ERROR(errno)
+-#define FCGI_LOG_ERR
__FILE__,__LINE__,APLOG_ERR,APR_FROM_OS_ERROR(errno)
+-#define FCGI_LOG_WARN
__FILE__,__LINE__,APLOG_WARNING,APR_FROM_OS_ERROR(errno)
+-#define FCGI_LOG_NOTICE
__FILE__,__LINE__,APLOG_NOTICE,APR_FROM_OS_ERROR(errno)
+-#define FCGI_LOG_INFO
__FILE__,__LINE__,APLOG_INFO,APR_FROM_OS_ERROR(errno)
+-#define FCGI_LOG_DEBUG
__FILE__,__LINE__,APLOG_DEBUG,APR_FROM_OS_ERROR(errno)
+-#endif
+-
+-#define FCGI_LOG_EMERG_ERRNO
__FILE__,__LINE__,APLOG_EMERG,APR_FROM_OS_ERROR(errno)
+-#define FCGI_LOG_ALERT_ERRNO
__FILE__,__LINE__,APLOG_ALERT,APR_FROM_OS_ERROR(errno)
+-#define FCGI_LOG_CRIT_ERRNO
__FILE__,__LINE__,APLOG_CRIT,APR_FROM_OS_ERROR(errno)
+-#define FCGI_LOG_ERR_ERRNO
__FILE__,__LINE__,APLOG_ERR,APR_FROM_OS_ERROR(errno)
+-#define FCGI_LOG_WARN_ERRNO
__FILE__,__LINE__,APLOG_WARNING,APR_FROM_OS_ERROR(errno)
+-#define FCGI_LOG_NOTICE_ERRNO
__FILE__,__LINE__,APLOG_NOTICE,APR_FROM_OS_ERROR(errno)
+-#define FCGI_LOG_INFO_ERRNO
__FILE__,__LINE__,APLOG_INFO,APR_FROM_OS_ERROR(errno)
+-#define FCGI_LOG_DEBUG_ERRNO
[packages/apache-mod_fastcgi] Release 8
commit e61aaa498ad7f455330479370860daf49497f310
Author: Aria aredri...@nbtsc.org
Date: Sat Jun 1 10:57:17 2013 -0600
Release 8
apache-mod_fastcgi.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/apache-mod_fastcgi.spec b/apache-mod_fastcgi.spec
index 45061a2..18fb91d 100644
--- a/apache-mod_fastcgi.spec
+++ b/apache-mod_fastcgi.spec
@@ -7,7 +7,7 @@ Summary(uk.UTF-8): FastCGI - більш швидка версія CGI
Name: apache-mod_%{mod_name}
# NOTE: remember about apache1-mod_fastcgi.spec when messing here
Version: 2.4.6
-Release: 7
+Release: 8
License: distributable
Group: Networking/Daemons/HTTP
Source0: http://www.fastcgi.com/dist/mod_%{mod_name}-%{version}.tar.gz
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/apache-mod_fastcgi.git/commitdiff/e61aaa498ad7f455330479370860daf49497f310
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/libxcb] - up to 1.9.1; add xkb and xselinux; fixes CVE-2013-2064
commit c170332a43e3de93443efbbd031a2a8863eca3b2
Author: Arkadiusz Miśkiewicz ar...@maven.pl
Date: Sat Jun 1 19:21:15 2013 +0200
- up to 1.9.1; add xkb and xselinux; fixes CVE-2013-2064
libxcb.spec | 16 ++--
1 file changed, 14 insertions(+), 2 deletions(-)
---
diff --git a/libxcb.spec b/libxcb.spec
index 033b555..c8286e3 100644
--- a/libxcb.spec
+++ b/libxcb.spec
@@ -6,12 +6,12 @@
Summary: X protocol C-language Binding library
Summary(pl.UTF-8): XCB - biblioteka dowiązań języka C do protokołu X
Name: libxcb
-Version: 1.9
+Version: 1.9.1
Release: 1
License: MIT
Group: Libraries
Source0: http://xcb.freedesktop.org/dist/%{name}-%{version}.tar.bz2
-# Source0-md5: 2b05856e9d1cb37836aae7406f2f4ce2
+# Source0-md5: ed632cb0dc31b6fbd7ea5c0f931cf5a4
URL: http://xcb.freedesktop.org/
BuildRequires: autoconf = 2.57
BuildRequires: automake
@@ -119,6 +119,8 @@ Dokumentacja API biblioteki XCB.
%{__autoconf}
%{__automake}
%configure \
+ --enable-selinux \
+ --enable-xkb \
--disable-silent-rules
%{__make}
@@ -183,6 +185,10 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %ghost %{_libdir}/libxcb-xv.so.0
%attr(755,root,root) %{_libdir}/libxcb-xvmc.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libxcb-xvmc.so.0
+%attr(755,root,root) %{_libdir}/libxcb-xkb.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libxcb-xkb.so.0
+%attr(755,root,root) %{_libdir}/libxcb-xselinux.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libxcb-xselinux.so.0
%files devel
%defattr(644,root,root,755)
@@ -205,7 +211,9 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_libdir}/libxcb-xf86dri.so
%attr(755,root,root) %{_libdir}/libxcb-xfixes.so
%attr(755,root,root) %{_libdir}/libxcb-xinerama.so
+%attr(755,root,root) %{_libdir}/libxcb-xkb.so
%attr(755,root,root) %{_libdir}/libxcb-xprint.so
+%attr(755,root,root) %{_libdir}/libxcb-xselinux.so
%attr(755,root,root) %{_libdir}/libxcb-xtest.so
%attr(755,root,root) %{_libdir}/libxcb-xv.so
%attr(755,root,root) %{_libdir}/libxcb-xvmc.so
@@ -227,7 +235,9 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/libxcb-xf86dri.la
%{_libdir}/libxcb-xfixes.la
%{_libdir}/libxcb-xinerama.la
+%{_libdir}/libxcb-xkb.la
%{_libdir}/libxcb-xprint.la
+%{_libdir}/libxcb-xselinux.la
%{_libdir}/libxcb-xtest.la
%{_libdir}/libxcb-xv.la
%{_libdir}/libxcb-xvmc.la
@@ -257,7 +267,9 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/libxcb-xf86dri.a
%{_libdir}/libxcb-xfixes.a
%{_libdir}/libxcb-xinerama.a
+%{_libdir}/libxcb-xkb.a
%{_libdir}/libxcb-xprint.a
+%{_libdir}/libxcb-xselinux.a
%{_libdir}/libxcb-xtest.a
%{_libdir}/libxcb-xv.a
%{_libdir}/libxcb-xvmc.a
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/libxcb.git/commitdiff/c170332a43e3de93443efbbd031a2a8863eca3b2
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: libxcb: libxcb-1.9.1.tar.bz2
Files fetched: 1 STORED: http://xcb.freedesktop.org/dist/libxcb-1.9.1.tar.bz2 ed632cb0dc31b6fbd7ea5c0f931cf5a4 libxcb-1.9.1.tar.bz2 Size: 373312 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/ganeti] - added systemd support - added init scripts - packaged bash-completion script - updated BRs
commit bc935a7ab3e0b6a69361f2d76342824a95abe825
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Sat Jun 1 18:17:16 2013 +0200
- added systemd support
- added init scripts
- packaged bash-completion script
- updated BRs
ganeti-confd.init | 108 +++
ganeti-masterd.init | 108 +++
ganeti-noded.init | 108 +++
ganeti-rapi.init| 110
ganeti.spec | 63 -
systemd.patch | 129
6 files changed, 615 insertions(+), 11 deletions(-)
---
diff --git a/ganeti.spec b/ganeti.spec
index 9efaf0e..956e5e5 100644
--- a/ganeti.spec
+++ b/ganeti.spec
@@ -7,8 +7,16 @@ Group: Applications/System
Source0: https://ganeti.googlecode.com/files/%{name}-%{version}.tar.gz
# Source0-md5: 9d9a0c5c0341d5775988961449f82b99
Source1: %{name}.tmpfiles
+Source2: ganeti-confd.init
+Source3: ganeti-masterd.init
+Source4: ganeti-noded.init
+Source5: ganeti-rapi.init
Patch0:fix-no-kvm.patch
+Patch1:systemd.patch
URL: https://code.google.com/p/ganeti/
+BuildRequires: autoconf
+BuildRequires: automake
+BuildRequires: curl-devel
BuildRequires: fakeroot
BuildRequires: gawk
BuildRequires: ghc
@@ -16,12 +24,14 @@ BuildRequires: ghc-QuickCheck
BuildRequires: ghc-curl
BuildRequires: ghc-haskell-platform
BuildRequires: ghc-json
+BuildRequires: gmp-devel
BuildRequires: hlint
BuildRequires: hscolour
BuildRequires: python
BuildRequires: python-affinity
BuildRequires: python-modules
BuildRequires: python-paramiko
+BuildRequires: python-pyOpenSSL
BuildRequires: python-pycurl
BuildRequires: python-pyinotify
BuildRequires: python-pyparsing
@@ -56,11 +66,23 @@ The tools provided are:
- hspace, used for capacity calculation
- hscan, used to gather cluster files for offline use in hbal/hspace
+%package -n bash-completion-ganeti
+Summary: bash-completion for ganeti
+Group: Applications/Shells
+Requires: %{name} = %{version}
+
+%description -n bash-completion-ganeti
+bash-completion for ganeti.
+
%prep
%setup -q
%patch0 -p1
+%patch1 -p1
%build
+%{__aclocal} -I autotools
+%{__autoconf}
+%{__automake}
# DON'T use full path to xl binary, just 'xl' (see lib/hypervisor/hv_xen.py
for a reason)
%configure \
IP_PATH=/sbin/ip \
@@ -83,12 +105,23 @@ The tools provided are:
%install
rm -rf $RPM_BUILD_ROOT
install -d $RPM_BUILD_ROOT{%{systemdunitdir},%{systemdtmpfilesdir}} \
- $RPM_BUILD_ROOT/etc/{sysconfig,rc.d/init.d}
+
$RPM_BUILD_ROOT/etc/{ganeti,cron.d,bash_completion.d,sysconfig,rc.d/init.d}
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
install %{SOURCE1} $RPM_BUILD_ROOT%{systemdtmpfilesdir}/ganeti.conf
+install %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/ganeti-confd
+install %{SOURCE3} $RPM_BUILD_ROOT/etc/rc.d/init.d/ganeti-masterd
+install %{SOURCE4} $RPM_BUILD_ROOT/etc/rc.d/init.d/ganeti-noded
+install %{SOURCE5} $RPM_BUILD_ROOT/etc/rc.d/init.d/ganeti-rapi
+
+install doc/examples/bash_completion
$RPM_BUILD_ROOT/etc/bash_completion.d/ganeti
+install doc/examples/ganeti.cron $RPM_BUILD_ROOT/etc/cron.d/ganeti
+install doc/examples/ganeti.default $RPM_BUILD_ROOT/etc/sysconfig/ganeti
+install doc/examples/ganeti.target $RPM_BUILD_ROOT%{systemdunitdir}
+install doc/examples/ganeti.target $RPM_BUILD_ROOT%{systemdunitdir}
+install doc/examples/ganeti-{noded,masterd,rapi,confd}.service
$RPM_BUILD_ROOT%{systemdunitdir}
%py_postclean
@@ -110,14 +143,14 @@ fi
%post
/sbin/chkconfig --add %{name}
%service %{name} restart
-%systemd_post %{name}.service
+%systemd_post ganeti.target ganeti-noded.service ganeti-masterd.service
ganeti-rapi.service ganeti-confd.service
%preun
if [ $1 = 0 ]; then
%service -q %{name} stop
/sbin/chkconfig --del %{name}
fi
-%systemd_preun %{name}.service
+%systemd_preun ganeti.target ganeti-noded.service ganeti-masterd.service
ganeti-rapi.service ganeti-confd.service
%postun
%systemd_reload
@@ -125,15 +158,19 @@ fi
%files
%defattr(644,root,root,755)
%doc NEWS README UPGRADE
-%attr(754,root,root) /etc/rc.d/init.d/%{name}
-%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/%{name}
-%{systemdunitdir}/%{name}.service
+%attr(754,root,root) /etc/rc.d/init.d/ganeti-confd
+%attr(754,root,root) /etc/rc.d/init.d/ganeti-masterd
+%attr(754,root,root) /etc/rc.d/init.d/ganeti-noded
+%attr(754,root,root) /etc/rc.d/init.d/ganeti-rapi
+%config(noreplace) %verify(not md5 mtime size) /etc/sysconfig/ganeti
+%dir %{_sysconfdir}/ganeti
+%{systemdunitdir}/ganeti.target
+%{systemdunitdir}/ganeti-confd.service
+%{systemdunitdir}/ganeti-masterd.service
+%{systemdunitdir}/ganeti-noded.service
+%{systemdunitdir}/ganeti-rapi.service
%{systemdtmpfilesdir}/ganeti.conf
-%if 0
-# if
[packages/ganeti] - run daemons as root for now
commit 848d00382600db3c440d916cb2d273d750ca8755
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Sat Jun 1 18:25:54 2013 +0200
- run daemons as root for now
ganeti-confd.init | 2 +-
ganeti-masterd.init | 2 +-
ganeti-noded.init | 2 +-
ganeti-rapi.init| 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/ganeti-confd.init b/ganeti-confd.init
index 3de8610..dc0a247 100644
--- a/ganeti-confd.init
+++ b/ganeti-confd.init
@@ -37,7 +37,7 @@ start() {
fi
msg_starting Ganeti Cluster config daemon
- daemon --user USER --pidfile /var/run/ganeti/ganeti-confd.pid
/usr/sbin/ganeti-confd $CONFD_ARGS
+ daemon --pidfile /var/run/ganeti/ganeti-confd.pid
/usr/sbin/ganeti-confd $CONFD_ARGS
RETVAL=$?
[ $RETVAL -eq 0 ] touch /var/lock/subsys/ganeti-confd
}
diff --git a/ganeti-masterd.init b/ganeti-masterd.init
index 8cded62..4511dab 100644
--- a/ganeti-masterd.init
+++ b/ganeti-masterd.init
@@ -37,7 +37,7 @@ start() {
fi
msg_starting Ganeti Cluster master daemon
- daemon --user USER --pidfile /var/run/ganeti/ganeti-masterd.pid
/usr/sbin/ganeti-masterd $MASTERD_ARGS
+ daemon --pidfile /var/run/ganeti/ganeti-masterd.pid
/usr/sbin/ganeti-masterd $MASTERD_ARGS
RETVAL=$?
[ $RETVAL -eq 0 ] touch /var/lock/subsys/ganeti-masterd
}
diff --git a/ganeti-noded.init b/ganeti-noded.init
index 8d255b5..8b4db35 100644
--- a/ganeti-noded.init
+++ b/ganeti-noded.init
@@ -37,7 +37,7 @@ start() {
fi
msg_starting Ganeti Cluster node daemon
- daemon --user USER --pidfile /var/run/ganeti/ganeti-noded.pid
/usr/sbin/ganeti-noded $NODED_ARGS
+ daemon --pidfile /var/run/ganeti/ganeti-noded.pid
/usr/sbin/ganeti-noded $NODED_ARGS
RETVAL=$?
[ $RETVAL -eq 0 ] touch /var/lock/subsys/ganeti-noded
}
diff --git a/ganeti-rapi.init b/ganeti-rapi.init
index cf93c34..1cd1b12 100644
--- a/ganeti-rapi.init
+++ b/ganeti-rapi.init
@@ -39,7 +39,7 @@ start() {
fi
msg_starting Ganeti Cluster remote API daemon
- daemon --user USER --pidfile /var/run/ganeti/ganeti-rapi.pid
/usr/sbin/ganeti-rapi $_ARGS
+ daemon --pidfile /var/run/ganeti/ganeti-rapi.pid /usr/sbin/ganeti-rapi
$_ARGS
RETVAL=$?
[ $RETVAL -eq 0 ] touch /var/lock/subsys/ganeti-rapi
}
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ganeti.git/commitdiff/4a9e23c9e944b71ae71ab5ca75027fdf3a164816
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/ganeti] - updated post scriptlets
commit da74baa0363d0d348823bb63575bb6e0ad182e0d
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Sat Jun 1 18:29:56 2013 +0200
- updated post scriptlets
ganeti.spec | 32
1 file changed, 16 insertions(+), 16 deletions(-)
---
diff --git a/ganeti.spec b/ganeti.spec
index 956e5e5..1bc7370 100644
--- a/ganeti.spec
+++ b/ganeti.spec
@@ -128,27 +128,27 @@ install
doc/examples/ganeti-{noded,masterd,rapi,confd}.service $RPM_BUILD_ROOT%{
%clean
rm -rf $RPM_BUILD_ROOT
-%if 0
-%pre
-%groupadd -g xxx %{name}
-%useradd -u xxx -d /var/lib/%{name} -g %{name} -c XXX User %{name}
-
-%postun
-if [ $1 = 0 ]; then
- %userremove %{name}
- %groupremove %{name}
-fi
-%endif
-
%post
-/sbin/chkconfig --add %{name}
-%service %{name} restart
+/sbin/chkconfig --add ganeti-noded
+%service ganeti-noded restart
+/sbin/chkconfig --add ganeti-masterd
+%service ganeti-masterd restart
+/sbin/chkconfig --add ganeti-rapi
+%service ganeti-rapi restart
+/sbin/chkconfig --add ganeti-confd
+%service ganeti-confd restart
%systemd_post ganeti.target ganeti-noded.service ganeti-masterd.service
ganeti-rapi.service ganeti-confd.service
%preun
if [ $1 = 0 ]; then
- %service -q %{name} stop
- /sbin/chkconfig --del %{name}
+ %service -q ganeti-confd stop
+ /sbin/chkconfig --del ganeti-confd
+ %service -q ganeti-rapi stop
+ /sbin/chkconfig --del ganeti-rapi
+ %service -q ganeti-masterd stop
+ /sbin/chkconfig --del ganeti-masterd
+ %service -q ganeti-noded stop
+ /sbin/chkconfig --del ganeti-noded
fi
%systemd_preun ganeti.target ganeti-noded.service ganeti-masterd.service
ganeti-rapi.service ganeti-confd.service
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ganeti.git/commitdiff/4a9e23c9e944b71ae71ab5ca75027fdf3a164816
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/ganeti] - startup script/services cleanup
commit 4a9e23c9e944b71ae71ab5ca75027fdf3a164816
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Sat Jun 1 19:48:28 2013 +0200
- startup script/services cleanup
ganeti-confd.init | 1 +
ganeti-masterd.init | 1 +
ganeti-noded.init | 1 +
ganeti-rapi.init| 1 +
ganeti.spec | 4
systemd.patch | 12
6 files changed, 16 insertions(+), 4 deletions(-)
---
diff --git a/ganeti.spec b/ganeti.spec
index 1bc7370..437bc31 100644
--- a/ganeti.spec
+++ b/ganeti.spec
@@ -13,6 +13,7 @@ Source4: ganeti-noded.init
Source5: ganeti-rapi.init
Patch0:fix-no-kvm.patch
Patch1:systemd.patch
+Patch2:daemon-util-use-service.patch
URL: https://code.google.com/p/ganeti/
BuildRequires: autoconf
BuildRequires: automake
@@ -78,6 +79,7 @@ bash-completion for ganeti.
%setup -q
%patch0 -p1
%patch1 -p1
+%patch2 -p1
%build
%{__aclocal} -I autotools
@@ -116,6 +118,8 @@ install %{SOURCE3}
$RPM_BUILD_ROOT/etc/rc.d/init.d/ganeti-masterd
install %{SOURCE4} $RPM_BUILD_ROOT/etc/rc.d/init.d/ganeti-noded
install %{SOURCE5} $RPM_BUILD_ROOT/etc/rc.d/init.d/ganeti-rapi
+%{__sed} -i -e 's|@LIBDIR@|%{_libdir}|g'
$RPM_BUILD_ROOT/etc/rc.d/init.d/ganeti-*
+
install doc/examples/bash_completion
$RPM_BUILD_ROOT/etc/bash_completion.d/ganeti
install doc/examples/ganeti.cron $RPM_BUILD_ROOT/etc/cron.d/ganeti
install doc/examples/ganeti.default $RPM_BUILD_ROOT/etc/sysconfig/ganeti
diff --git a/ganeti-confd.init b/ganeti-confd.init
index dc0a247..c14d0b8 100644
--- a/ganeti-confd.init
+++ b/ganeti-confd.init
@@ -37,6 +37,7 @@ start() {
fi
msg_starting Ganeti Cluster config daemon
+ @LIBDIR@/ganeti/ensure-dirs
daemon --pidfile /var/run/ganeti/ganeti-confd.pid
/usr/sbin/ganeti-confd $CONFD_ARGS
RETVAL=$?
[ $RETVAL -eq 0 ] touch /var/lock/subsys/ganeti-confd
diff --git a/ganeti-masterd.init b/ganeti-masterd.init
index 4511dab..46181ee 100644
--- a/ganeti-masterd.init
+++ b/ganeti-masterd.init
@@ -37,6 +37,7 @@ start() {
fi
msg_starting Ganeti Cluster master daemon
+ @LIBDIR@/ganeti/ensure-dirs
daemon --pidfile /var/run/ganeti/ganeti-masterd.pid
/usr/sbin/ganeti-masterd $MASTERD_ARGS
RETVAL=$?
[ $RETVAL -eq 0 ] touch /var/lock/subsys/ganeti-masterd
diff --git a/ganeti-noded.init b/ganeti-noded.init
index 8b4db35..46cef5a 100644
--- a/ganeti-noded.init
+++ b/ganeti-noded.init
@@ -37,6 +37,7 @@ start() {
fi
msg_starting Ganeti Cluster node daemon
+ @LIBDIR@/ganeti/ensure-dirs
daemon --pidfile /var/run/ganeti/ganeti-noded.pid
/usr/sbin/ganeti-noded $NODED_ARGS
RETVAL=$?
[ $RETVAL -eq 0 ] touch /var/lock/subsys/ganeti-noded
diff --git a/ganeti-rapi.init b/ganeti-rapi.init
index 1cd1b12..03d567d 100644
--- a/ganeti-rapi.init
+++ b/ganeti-rapi.init
@@ -39,6 +39,7 @@ start() {
fi
msg_starting Ganeti Cluster remote API daemon
+ @LIBDIR@/ganeti/ensure-dirs
daemon --pidfile /var/run/ganeti/ganeti-rapi.pid /usr/sbin/ganeti-rapi
$_ARGS
RETVAL=$?
[ $RETVAL -eq 0 ] touch /var/lock/subsys/ganeti-rapi
diff --git a/systemd.patch b/systemd.patch
index 058394e..b415fec 100644
--- a/systemd.patch
+++ b/systemd.patch
@@ -25,7 +25,7 @@ http://code.google.com/p/ganeti/issues/detail?id=444
$(BUILT_PYTHON_SOURCES)
--- ganeti-2.6.2/doc/examples.orig/ganeti-confd.service.in 1970-01-01
01:00:00.0 +0100
+++ ganeti-2.6.2/doc/examples/ganeti-confd.service.in 2013-06-01
15:55:37.594893846 +0200
-@@ -0,0 +1,17 @@
+@@ -0,0 +1,18 @@
+[Unit]
+Description=Ganeti Confd
+Requires=ganeti-noded.service ganeti-masterd.service ganeti-rapi.service
@@ -35,6 +35,7 @@ http://code.google.com/p/ganeti/issues/detail?id=444
+Type=forking
+ConditionPathExists=@LOCALSTATEDIR@/lib/ganeti/server.pem
+EnvironmentFile=-/etc/sysconfig/ganeti
++ExecStartPre=@PKGLIBDIR@/ensure-dirs
+ExecStart=@PREFIX@/sbin/ganeti-confd $CONFD_ARGS
+User=@GNTCONFDUSER@
+Group=@GNTCONFDGROUP@
@@ -45,7 +46,7 @@ http://code.google.com/p/ganeti/issues/detail?id=444
+WantedBy=ganeti.target
--- ganeti-2.6.2/doc/examples.orig/ganeti-masterd.service.in 1970-01-01
01:00:00.0 +0100
+++ ganeti-2.6.2/doc/examples/ganeti-masterd.service.in2013-06-01
15:55:37.611560663 +0200
-@@ -0,0 +1,18 @@
+@@ -0,0 +1,19 @@
+[Unit]
+Description=Ganeti Masterd
+Requires=ganeti-noded.service
@@ -55,6 +56,7 @@ http://code.google.com/p/ganeti/issues/detail?id=444
+Type=forking
+ConditionPathExists=@LOCALSTATEDIR@/lib/ganeti/server.pem
+EnvironmentFile=-/etc/sysconfig/ganeti
++ExecStartPre=@PKGLIBDIR@/ensure-dirs
+ExecStart=@PREFIX@/sbin/ganeti-masterd $MASTERD_ARGS
+User=@GNTNODEDUSER@
+Group=@GNTDAEMONSGROUP@
@@ -66,7 +68,7 @@ http://code.google.com/p/ganeti/issues/detail?id=444
+WantedBy=ganeti.target
--- ganeti-2.6.2/doc/examples.orig/ganeti-noded.service.in
[packages/ganeti] - use /sbin/service in daemon-util to work with both sysvinit and systemd
commit 12efd2af9a8dcf5f3c2f1b395e1d0d030647fbdb
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Sat Jun 1 19:47:28 2013 +0200
- use /sbin/service in daemon-util to work with both sysvinit and systemd
daemon-util-use-service.patch | 107 ++
1 file changed, 107 insertions(+)
---
diff --git a/daemon-util-use-service.patch b/daemon-util-use-service.patch
new file mode 100644
index 000..74f5dfb
--- /dev/null
+++ b/daemon-util-use-service.patch
@@ -0,0 +1,107 @@
+--- ganeti-2.6.2/daemons/daemon-util.in~ 2012-12-21 15:38:52.0
+0100
ganeti-2.6.2/daemons/daemon-util.in2013-06-01 19:29:38.454569439
+0200
+@@ -45,12 +45,6 @@
+ . $defaults_file
+ fi
+
+-# Meant to facilitate use utilities in /etc/rc.d/init.d/functions in case
+-# start-stop-daemon is not available.
+-_ignore_error() {
+- eval $@ || :
+-}
+-
+ _daemon_pidfile() {
+ echo @LOCALSTATEDIR@/run/ganeti/$1.pid
+ }
+@@ -182,17 +176,8 @@
+ fi
+
+ local name=$1; shift
+- local pidfile=$(_daemon_pidfile $name)
+- local daemonexec=$(_daemon_executable $name)
+
+- if type -p start-stop-daemon /dev/null; then
+-start-stop-daemon --stop --signal 0 --quiet \
+- --pidfile $pidfile
+- else
+-_ignore_error status \
+- -p $pidfile \
+- $daemonexec
+- fi
++ /sbin/service $name status /dev/null 21
+ }
+
+ # Starts a daemon
+@@ -203,12 +188,6 @@
+ fi
+
+ local name=$1; shift
+- # Convert daemon name to uppercase after removing ganeti- prefix
+- local plain_name=${name#ganeti-}
+- local ucname=$(tr a-z A-Z $plain_name)
+- local pidfile=$(_daemon_pidfile $name)
+- local usergroup=$(_daemon_usergroup $plain_name)
+- local daemonexec=$(_daemon_executable $name)
+
+ if [[ $name == ganeti-confd
+ @CUSTOM_ENABLE_CONFD@ == False ]]; then
+@@ -216,25 +195,9 @@
+ return 1
+ fi
+
+- # Read $daemon_ARGS and $EXTRA_daemon_ARGS
+- eval local args=\\$${ucname}_ARGS \$EXTRA_${ucname}_ARGS\
+-
+ @PKGLIBDIR@/ensure-dirs
+
+- if type -p start-stop-daemon /dev/null; then
+-start-stop-daemon --start --quiet --oknodo \
+- --pidfile $pidfile \
+- --startas $daemonexec \
+- --chuid $usergroup \
+- -- $args $@
+- else
+-# TODO: Find a way to start daemon with a group, until then the group must
+-# be removed
+-_ignore_error daemon \
+- --pidfile $pidfile \
+- --user ${usergroup%:*} \
+- $daemonexec $args $@
+- fi
++ /sbin/service $name start
+ }
+
+ # Stops a daemon
+@@ -245,14 +208,8 @@
+ fi
+
+ local name=$1; shift
+- local pidfile=$(_daemon_pidfile $name)
+
+- if type -p start-stop-daemon /dev/null; then
+-start-stop-daemon --stop --quiet --oknodo --retry 30 \
+- --pidfile $pidfile
+- else
+-_ignore_error killproc -p $pidfile $name
+- fi
++ /sbin/service $name stop
+ }
+
+ # Starts a daemon if it's not yet running
+@@ -302,15 +259,9 @@
+
+ # Reloads the SSH keys
+ reload_ssh_keys() {
+- @RPL_SSH_INITD_SCRIPT@ restart
++ /sbin/service sshd restart
+ }
+
+-# Read @SYSCONFDIR@/rc.d/init.d/functions if start-stop-daemon not available
+-if ! type -p start-stop-daemon /dev/null \
+- [[ -f @SYSCONFDIR@/rc.d/init.d/functions ]]; then
+- _ignore_error . @SYSCONFDIR@/rc.d/init.d/functions
+-fi
+-
+ if [[ $# -lt 1 ]]; then
+ echo Usage: $0 action 2
+ exit 1
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/ganeti.git/commitdiff/4a9e23c9e944b71ae71ab5ca75027fdf3a164816
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/xtables-addons] Created branch XTADDONS_1
The branch 'XTADDONS_1' was created pointing to: 8e6b9cc... - rebuild for kernel-3.7.10-9 - release 23 (by relup.sh) ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/muse: 1/3] - removed outdated patch: muse-libtool.patch - added muse-CMakeLists.txt.patch for linking problems
commit 1ddf0e116a8da45fbd392f3b3cd9095556fa070c
Author: Lukasz Glebicki ble...@pld-linux.org
Date: Sat Jun 1 19:54:00 2013 +0200
- removed outdated patch: muse-libtool.patch
- added muse-CMakeLists.txt.patch for linking problems (X11) and change
muse-version install name to muse
muse-CMakeLists.txt.patch | 21 +
muse-libtool.patch| 16
muse.spec | 3 ++-
3 files changed, 23 insertions(+), 17 deletions(-)
---
diff --git a/muse.spec b/muse.spec
index 4ef9dee..ad63bde 100644
--- a/muse.spec
+++ b/muse.spec
@@ -16,6 +16,7 @@ Group:X11/Applications/Sound
Source0: http://downloads.sourceforge.net/lmuse/%{name}-%{version}.tar.gz
# Source0-md5: ad917335ac05a3d62e3cd073af901001
Source1: %{name}.desktop
+Patch0:%{name}-CMakeLists.txt.patch
URL: http://muse.seh.de/
BuildRequires: QtDesigner-devel
BuildRequires: QtSvg-devel
@@ -55,7 +56,7 @@ Dokumentacja do anta.
%prep
%setup -q
-sed -i 's,SET(MusE_INSTALL_NAME muse-2.1),SET(MusE_INSTALL_NAME muse),g'
CMakeLists.txt
+%patch0 -p0
%build
install -d build
diff --git a/muse-CMakeLists.txt.patch b/muse-CMakeLists.txt.patch
new file mode 100644
index 000..9d790be
--- /dev/null
+++ b/muse-CMakeLists.txt.patch
@@ -0,0 +1,21 @@
+--- muse/widgets/CMakeLists.txt.old2013-03-28 16:17:35.0 +0100
muse/widgets/CMakeLists.txt2013-06-01 19:34:33.0 +0200
+@@ -271,6 +271,7 @@
+ ##
+ target_link_libraries ( widgets
+ ${QT_LIBRARIES}
++ X11
+ icons
+ instruments
+ )
+--- CMakeLists.txt.org 2013-06-01 19:43:43.0 +0200
CMakeLists.txt 2013-06-01 19:45:23.0 +0200
+@@ -86,7 +86,7 @@
+ SET(MusE_VERSION_PATCH 0)
+ SET(MusE_VERSION 2.1.2)
+ SET(MusE_VERSION_FULL 2.1.2)
+-SET(MusE_INSTALL_NAME muse-2.1)
++SET(MusE_INSTALL_NAME muse)
+ SET(MusE_EXEC_NAME muse2)
+
+ ## The directory where we will install the shared components:
diff --git a/muse-libtool.patch b/muse-libtool.patch
deleted file mode 100644
index 67a6953..000
--- a/muse-libtool.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -Nur old/common.am new/common.am
old/common.am 2004-11-29 14:32:48.0 +
-+++ new/common.am 2005-03-22 11:35:20.0 +
-@@ -34,11 +34,10 @@
- $(UIC) -L $(top_srcdir)/muse/widgets -o $*.cpp -impl $*.h $*.ui
- $(MOC) $*.h -o moc_$*.cpp
- $(LTCXXCOMPILE) -c $*.cpp -o base_$*.lo
-+ $(LTCXXCOMPILE) -c $*.cpp -o $*.lo
- $(LTCXXCOMPILE) -c moc_$*.cpp -o moc_$*.lo
-- $(CXXLINK) -r base_$*.lo moc_$*.lo -o $*.lo
- $(RM) $*.cpp moc_$*.cpp base_$*.lo moc_$*.lo base_$*.o moc_$*.o
-
--
- moc_%.cpp: %.h
- $(MOC) $ -o $@
-
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/muse.git/commitdiff/8aa11bcfb1d65db1d087c6d26d0e66e224b77814
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/muse] (3 commits) ...- sed switched to patch - rel 2 for stbr
Summary of changes: 1ddf0e1... - removed outdated patch: muse-libtool.patch - added muse-C 1d70170... Merge branch 'master' of git://git.pld-linux.org/packages/m 8aa11bc... - sed switched to patch - rel 2 for stbr ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/muse: 2/3] Merge branch 'master' of git://git.pld-linux.org/packages/muse
commit 1d70170b730cca367b805bc8519b106872e7e5d4 Merge: 1ddf0e1 da17769 Author: Lukasz Glebicki ble...@pld-linux.org Date: Sat Jun 1 19:54:29 2013 +0200 Merge branch 'master' of git://git.pld-linux.org/packages/muse muse.spec | 10 ++ 1 file changed, 6 insertions(+), 4 deletions(-) --- gitweb: http://git.pld-linux.org/gitweb.cgi/packages/muse.git/commitdiff/8aa11bcfb1d65db1d087c6d26d0e66e224b77814 ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/muse: 3/3] - sed switched to patch - rel 2 for stbr
commit 8aa11bcfb1d65db1d087c6d26d0e66e224b77814
Author: Lukasz Glebicki ble...@pld-linux.org
Date: Sat Jun 1 19:58:44 2013 +0200
- sed switched to patch
- rel 2 for stbr
muse.spec | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
---
diff --git a/muse.spec b/muse.spec
index dad2e88..7cd0c06 100644
--- a/muse.spec
+++ b/muse.spec
@@ -10,7 +10,7 @@ Summary: Linux Music Editor
Summary(pl.UTF-8): Edytor muzyczny dla Linuksa
Name: muse
Version: 2.1.2
-Release: 1
+Release: 2
License: GPL
Group: X11/Applications/Sound
Source0: http://downloads.sourceforge.net/lmuse/%{name}-%{version}.tar.gz
@@ -33,7 +33,6 @@ BuildRequires:libsamplerate-devel = 0.1.0
BuildRequires: libsndfile-devel = 1.0.25
BuildRequires: libuuid-devel = 0.1.8
BuildRequires: rpmbuild(macros) = 1.213
-BuildRequires: sed = 4.0
Requires: gtk-update-icon-cache
Requires: hicolor-icon-theme
Requires: lash
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/muse.git/commitdiff/8aa11bcfb1d65db1d087c6d26d0e66e224b77814
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/xtables-addons/XTADDONS_1] - build userspace tools for alt_kernel
commit 764e837960c77c02a0b1c75534be91f6df79dbc2
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Sat Jun 1 20:07:59 2013 +0200
- build userspace tools for alt_kernel
xtables-addons.spec | 7 +++
1 file changed, 3 insertions(+), 4 deletions(-)
---
diff --git a/xtables-addons.spec b/xtables-addons.spec
index d7330a2..7309ef9 100644
--- a/xtables-addons.spec
+++ b/xtables-addons.spec
@@ -10,15 +10,12 @@
%if %{without kernel}
%undefine with_dist_kernel
%endif
-%if %{_alt_kernel} != %{nil}
-%undefine with_userspace
-%endif
%if %{without userspace}
# nothing to be placed to debuginfo package
%define_enable_debug_packages 0
%endif
-%definerel 23
+%definerel 24
%definepname xtables-addons
Summary: Additional extensions for xtables packet filtering system
Summary(pl.UTF-8): Dodatkowe rozszerzenia do systemu filtrowania pakietów
xtables
@@ -41,6 +38,8 @@ BuildRequires:rpmbuild(macros) = 1.379
BuildRequires: tar = 1.22
BuildRequires: xz
Requires: iptables = 1.4.5
+Provides: xtables-addons = %{version}-%{release}
+Obsoletes: xtables-addons %{version}-%{release}
Obsoletes: iptables-ipp2p
BuildRoot: %{tmpdir}/%{pname}-%{version}-root-%(id -u -n)
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/xtables-addons.git/commitdiff/764e837960c77c02a0b1c75534be91f6df79dbc2
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/apache-mod_python] - release 19 (by relup.sh)
commit 9cfb1ef9516d6750ff586ed1623567bc4b0bfa83
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Sat Jun 1 20:14:15 2013 +0200
- release 19 (by relup.sh)
apache-mod_python.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/apache-mod_python.spec b/apache-mod_python.spec
index d73c0d0..28c9f28 100644
--- a/apache-mod_python.spec
+++ b/apache-mod_python.spec
@@ -19,7 +19,7 @@ Summary(sl.UTF-8):Vključeni pythonski tolmač za spletni
strežnik Apache
Summary(sv.UTF-8): En inbyggd Python-interpretator för webbservern Apache
Name: apache-mod_%{mod_name}
Version: 3.3.1
-Release: 18
+Release: 19
License: Apache
Group: Networking/Daemons/HTTP
Source0:
http://www.apache.org/dist/httpd/modpython/mod_%{mod_name}-%{version}.tgz
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/apache-mod_python.git/commitdiff/9cfb1ef9516d6750ff586ed1623567bc4b0bfa83
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/gettext] - release 2 (by relup.sh)
commit a42d8f00ad9c343ce8f3149362e18107c425eee3
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Sat Jun 1 20:15:41 2013 +0200
- release 2 (by relup.sh)
gettext.spec | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
---
diff --git a/gettext.spec b/gettext.spec
index 1ac827b..cc52087 100644
--- a/gettext.spec
+++ b/gettext.spec
@@ -40,7 +40,7 @@ Summary(tr.UTF-8):Desteği için kitaplık ve araçlar
Summary(uk.UTF-8): Бібліотеки та утиліти для підтримки національних мов
Name: gettext
Version: 0.18.2.1
-Release: 1
+Release: 2
License: LGPL v2+ (libintl), GPL v3+ (tools)
Group: Development/Tools
Source0: http://ftp.gnu.org/gnu/gettext/%{name}-%{version}.tar.gz
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/gettext.git/commitdiff/a42d8f00ad9c343ce8f3149362e18107c425eee3
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/connman] - up to 1.15
commit d1f1934567ad3bf7f577f06d96c22e9436d5efa5
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Sat Jun 1 20:19:22 2013 +0200
- up to 1.15
connman.spec | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/connman.spec b/connman.spec
index 005b474..e048b74 100644
--- a/connman.spec
+++ b/connman.spec
@@ -1,12 +1,12 @@
Summary: Connection Manager
Summary(pl.UTF-8): Zarządca połączeń
Name: connman
-Version: 1.13
+Version: 1.15
Release: 1
License: GPL v2
Group: Networking/Daemons
Source0:
http://www.kernel.org/pub/linux/network/connman/%{name}-%{version}.tar.xz
-# Source0-md5: 0623d4afe3792378da5818e2970c5f1c
+# Source0-md5: e785c0c4564bfffb5215272f1be6f17c
Patch0:%{name}-linux.patch
URL: http://connman.net/
BuildRequires: dbus-devel = 1.4
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/connman.git/commitdiff/d1f1934567ad3bf7f577f06d96c22e9436d5efa5
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: connman: connman-1.15.tar.xz
Files fetched: 1 STORED: http://www.kernel.org/pub/linux/network/connman/connman-1.15.tar.xz e785c0c4564bfffb5215272f1be6f17c connman-1.15.tar.xz Size: 598304 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/connman] - package man pages
commit 63b01b855428be6575bc3930fcf34640ffa96c4c
Author: Jan Rękorajski bagg...@pld-linux.org
Date: Sat Jun 1 20:31:36 2013 +0200
- package man pages
connman.spec | 2 ++
1 file changed, 2 insertions(+)
---
diff --git a/connman.spec b/connman.spec
index e048b74..c1c76d7 100644
--- a/connman.spec
+++ b/connman.spec
@@ -128,6 +128,8 @@ rm -rf $RPM_BUILD_ROOT
/usr/share/polkit-1/actions/net.connman.vpn.policy
%{systemdunitdir}/connman.service
%{systemdunitdir}/connman-vpn.service
+%{_mandir}/man5/connman.conf.5*
+%{_mandir}/man8/connman.8*
%files devel
%defattr(644,root,root,755)
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/connman.git/commitdiff/63b01b855428be6575bc3930fcf34640ffa96c4c
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/pianobooster] - added patch for linking problems and error: unrecognized command line option '-mwindows'
commit 357376e4051e5e5961f4018ba9d30da53913c3c8
Author: Lukasz Glebicki ble...@pld-linux.org
Date: Sat Jun 1 22:11:23 2013 +0200
- added patch for linking problems and error: unrecognized command line
option '-mwindows'
pianobooster-CMakeLists.patch | 11 +++
pianobooster.spec | 2 ++
2 files changed, 13 insertions(+)
---
diff --git a/pianobooster.spec b/pianobooster.spec
index de4e7bf..36bbffc 100644
--- a/pianobooster.spec
+++ b/pianobooster.spec
@@ -8,6 +8,7 @@ Group: X11/Applications/Games
Source0:
http://downloads.sourceforge.net/pianobooster/%{name}-src-%{version}.tar.gz
# Source0-md5: 4c1c34a4b763e6108aa9668be7890696
Patch0:%{name}-desktop.patch
+Patch1:%{name}-CMakeLists.patch
URL: http://pianobooster.sourceforge.net/
BuildRequires: QtCore-devel
BuildRequires: QtGui-devel
@@ -36,6 +37,7 @@ na grę użytkownika korzystającego z muzycznej klawiatury midi.
%prep
%setup -q -n %{name}-src-%{version}
%patch0 -p1
+%patch1 -p0
%build
cd build
diff --git a/pianobooster-CMakeLists.patch b/pianobooster-CMakeLists.patch
new file mode 100644
index 000..ba1cf1c
--- /dev/null
+++ b/pianobooster-CMakeLists.patch
@@ -0,0 +1,11 @@
+--- src/CMakeLists.txt.org 2013-06-01 21:44:31.0 +0200
src/CMakeLists.txt 2013-06-01 21:45:19.0 +0200
+@@ -203,7 +203,7 @@
+ ${PIANOBOOSTER_UI_HDRS} )
+ ENDIF(WIN32)
+
+-SET_TARGET_PROPERTIES(pianobooster PROPERTIES LINK_FLAGS -mwindows)
++SET_TARGET_PROPERTIES(pianobooster PROPERTIES LINK_FLAGS -lGL -lpthread)
+
+ IF (USE_PCH)
+ ADD_PRECOMPILED_HEADER( pianobooster
${CMAKE_CURRENT_SOURCE_DIR}/precompile/precompile.h )
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/pianobooster.git/commitdiff/357376e4051e5e5961f4018ba9d30da53913c3c8
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/puredata] - fixed problem with building on x86_64
commit 7c7a2c1628dd2c9f1b469a20fa230d20399c5859
Author: Lukasz Glebicki ble...@pld-linux.org
Date: Sat Jun 1 23:10:47 2013 +0200
- fixed problem with building on x86_64
puredata-makefile.patch | 40
puredata.spec | 7 +--
2 files changed, 45 insertions(+), 2 deletions(-)
---
diff --git a/puredata.spec b/puredata.spec
index d8a8868..4a46afa 100644
--- a/puredata.spec
+++ b/puredata.spec
@@ -3,12 +3,13 @@
Summary: Pd - free real-time computer music software package resembling
Max
Summary(pl.UTF-8): Pd - darmowy pakiet do muzyki w czasie rzeczywistym
podobny do Maksa
Name: puredata
-Version: 0.40.2
+Version: 0.44.0
Release: 0.1
License: BSD, only expr plugin on GPL
Group: Libraries
Source0: http://dl.sourceforge.net/pure-data/pd-0.40-2.src.tar.gz
# Source0-md5: 2622e12b6fa0bd69db9732972e953afb
+Patch0:%{name}-makefile.patch
URL: http://puredata.info/
BuildRequires: alsa-lib-devel
BuildRequires: fftw-devel
@@ -38,6 +39,7 @@ Plik nagłówkowy Pd.
%prep
%setup -q -n pd-0.40-2
+%patch0 -p0
cp extra/expr~/README.txt README-expr.txt
@@ -45,7 +47,8 @@ cp extra/expr~/README.txt README-expr.txt
cd src
%configure \
--with-fftw \
- --with-jack
+ --with-jack \
+ --with-alsa \
# --with-portaudio --with-portmidi (fix to use system lisb)
%{__make} \
CC=%{__cc} \
diff --git a/puredata-makefile.patch b/puredata-makefile.patch
new file mode 100644
index 000..063ec55
--- /dev/null
+++ b/puredata-makefile.patch
@@ -0,0 +1,40 @@
+--- extra/makefile~2006-09-25 06:17:22.0 +0200
extra/makefile 2013-06-01 22:44:59.0 +0200
+@@ -57,7 +57,7 @@
+
+ .SUFFIXES: .pd_linux
+
+-LINUXCFLAGS = -DPD -O2 -funroll-loops -fomit-frame-pointer -fPIC -m32 \
++LINUXCFLAGS = -DPD -O2 -funroll-loops -fomit-frame-pointer -fPIC \
+ -Wall -W -Wshadow -Wstrict-prototypes \
+ -Wno-unused -Wno-parentheses -Wno-switch $(CFLAGS)
+
+@@ -65,7 +65,7 @@
+
+ .c.pd_linux:
+ $(CC) $(LINUXCFLAGS) $(LINUXINCLUDE) -o $*.o -c $*.c
+- $(CC) -m32 -export_dynamic -shared -o $*.pd_linux $*.o -lc -lm
++ $(CC) -export_dynamic -shared -o $*.pd_linux $*.o -lc -lm
+ strip --strip-unneeded $*.pd_linux
+ rm -f $*.o
+
+--- extra/expr~/makefile~ 2006-09-25 06:19:11.0 +0200
extra/expr~/makefile 2013-06-01 22:45:27.0 +0200
+@@ -77,7 +77,7 @@
+ LINUXOBJ = vexp.pd_linux_o vexp_fun.pd_linux_o vexp_if.pd_linux_o
+ .SUFFIXES: .pd_linux_o
+
+-LINUXCFLAGS = -DPD -O2 -funroll-loops -fomit-frame-pointer -fPIC -m32 \
++LINUXCFLAGS = -DPD -O2 -funroll-loops -fomit-frame-pointer -fPIC \
+ -Wall -W -Wshadow -Wstrict-prototypes \
+ -Wno-unused -Wno-parentheses -Wno-switch
+
+@@ -87,7 +87,7 @@
+ $(CC) -g $(LINUXCFLAGS) $(LINUXINCLUDE) -o $*.pd_linux_o -c $*.c
+
+ expr.pd_linux: $(LINUXOBJ)
+- $(CC) -m32 -export_dynamic -shared -o expr.pd_linux $(LINUXOBJ) -lc -lm
++ $(CC) -export_dynamic -shared -o expr.pd_linux $(LINUXOBJ) -lc -lm
+ strip --strip-unneeded expr.pd_linux
+
+ expr~.pd_linux: expr.pd_linux
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/puredata.git/commitdiff/7c7a2c1628dd2c9f1b469a20fa230d20399c5859
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
[packages/waf] - up to 1.7.11
commit cec1adbfe5bfff2b83419e4501613f2e3e32385e
Author: Lukasz Glebicki ble...@pld-linux.org
Date: Sat Jun 1 23:44:09 2013 +0200
- up to 1.7.11
waf.spec | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/waf.spec b/waf.spec
index b480d14..25af3b8 100644
--- a/waf.spec
+++ b/waf.spec
@@ -1,14 +1,14 @@
Summary: The Waf build system
Summary(pl.UTF-8): System budowania Waf
Name: waf
-Version: 1.7.9
+Version: 1.7.11
Release: 1
# note: waf book is on CC-BY-NC-ND (not included in binary package)
License: BSD
Group: Development/Building
#Source0Download: http://code.google.com/p/waf/downloads/list
Source0: http://waf.googlecode.com/files/%{name}-%{version}.tar.bz2
-# Source0-md5: 0f5a3ecf23e80a42324dac9415de09fb
+# Source0-md5: c8b992694a683bc250cf1dff7c77dbfa
Patch0:%{name}-path.patch
URL: http://code.google.com/p/waf/
BuildRequires: python = 1:2.6
gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/waf.git/commitdiff/cec1adbfe5bfff2b83419e4501613f2e3e32385e
___
pld-cvs-commit mailing list
pld-cvs-commit@lists.pld-linux.org
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
DISTFILES: waf: waf-1.7.11.tar.bz2
Files fetched: 1 STORED: http://waf.googlecode.com/files/waf-1.7.11.tar.bz2 c8b992694a683bc250cf1dff7c77dbfa waf-1.7.11.tar.bz2 Size: 709256 bytes -- Virtually Yours: distfiles. ___ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
