* [IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. d137cccc3d39f9036ca5f02cecc5604a9f5a51bd
@ 2012-03-10 11:10 git
0 siblings, 0 replies; only message in thread
From: git @ 2012-03-10 11:10 UTC (permalink / raw)
To: ipfire-scm
[-- Attachment #1: Type: text/plain, Size: 10778 bytes --]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 3.x development tree".
The branch, master has been updated
via d137cccc3d39f9036ca5f02cecc5604a9f5a51bd (commit)
via 041a6c71b9bea5593365ddf41e547157cf8b5af9 (commit)
via cb1de7e7d5f0177515e160324bf6ac61954fd0bd (commit)
via 0ab7e541a8ae639c24c7836b4c8c4b791c828ce9 (commit)
from 63c2bb861b082f50a2707b0b1546f41b53801bdb (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit d137cccc3d39f9036ca5f02cecc5604a9f5a51bd
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Mar 10 12:10:12 2012 +0100
gettext: autopoint (-devel package) requires git at runtime.
commit 041a6c71b9bea5593365ddf41e547157cf8b5af9
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Mar 10 12:09:42 2012 +0100
freeradius: Fix package name and make it compile on x86_64.
commit cb1de7e7d5f0177515e160324bf6ac61954fd0bd
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sat Mar 10 12:09:06 2012 +0100
xorg-x11-proto-devel: Fix invalid location of .pc files.
commit 0ab7e541a8ae639c24c7836b4c8c4b791c828ce9
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Thu Mar 8 00:11:50 2012 +0100
cpufrequtils: Remove package.
The functionality is now provided by cpupower which
comes with the Linux kernel (kernel-tools).
-----------------------------------------------------------------------
Summary of changes:
cpufrequtils/cpufrequtils.nm | 43 -------------------
.../patches/cpufrequtils-008-aperf-32bit.patch | 11 -----
.../patches/cpufrequtils-008-no-aperf-on-ppc.patch | 45 --------------------
cpufrequtils/patches/cpufrequtils-multilib.patch | 12 -----
cpufrequtils/patches/disable-gsic.patch | 11 -----
freeradius/freeradius.nm | 16 ++++---
gettext/gettext.nm | 3 +-
xorg-x11-proto-devel/xorg-x11-proto-devel.nm | 8 +++-
8 files changed, 17 insertions(+), 132 deletions(-)
delete mode 100644 cpufrequtils/cpufrequtils.nm
delete mode 100644 cpufrequtils/patches/cpufrequtils-008-aperf-32bit.patch
delete mode 100644 cpufrequtils/patches/cpufrequtils-008-no-aperf-on-ppc.patch
delete mode 100644 cpufrequtils/patches/cpufrequtils-multilib.patch
delete mode 100644 cpufrequtils/patches/disable-gsic.patch
Difference in files:
diff --git a/cpufrequtils/cpufrequtils.nm b/cpufrequtils/cpufrequtils.nm
deleted file mode 100644
index 6465a45..0000000
--- a/cpufrequtils/cpufrequtils.nm
+++ /dev/null
@@ -1,43 +0,0 @@
-###############################################################################
-# IPFire.org - An Open Source Firewall Solution #
-# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
-###############################################################################
-
-name = cpufrequtils
-version = 008
-release = 5
-
-groups = Applications/System
-url = http://htop.sourceforge.net/
-license = GPLv2
-summary = Command line tools to determine current CPUfreq settings and to modify them
-
-description
- Command line tools to determine current CPUfreq settings and to modify them
-end
-
-source_dl =
-
-build
- requires
- gettext
- libtool
- sysfsutils
- end
-
- make_install_targets += mandir=/usr/share/man
-end
-
-packages
- package %{name}
- groups += Base
- end
-
- package %{name}-devel
- template DEVEL
- end
-
- package %{name}-debuginfo
- template DEBUGINFO
- end
-end
diff --git a/cpufrequtils/patches/cpufrequtils-008-aperf-32bit.patch b/cpufrequtils/patches/cpufrequtils-008-aperf-32bit.patch
deleted file mode 100644
index ae94b0a..0000000
--- a/cpufrequtils/patches/cpufrequtils-008-aperf-32bit.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- cpufrequtils-008/utils/aperf.c 2010-07-05 17:43:17.000000000 +0200
-+++ cpufrequtils-008/utils/aperf.c.new 2011-02-07 16:34:17.421278000 +0100
-@@ -96,7 +96,7 @@
- return -1;
- if (lseek(fd, idx, SEEK_CUR) == -1)
- goto err;
-- if (read(fd, val, sizeof val) != sizeof *val)
-+ if (read(fd, val, sizeof *val) != sizeof *val)
- goto err;
- close(fd);
- return 0;
diff --git a/cpufrequtils/patches/cpufrequtils-008-no-aperf-on-ppc.patch b/cpufrequtils/patches/cpufrequtils-008-no-aperf-on-ppc.patch
deleted file mode 100644
index 8bfca01..0000000
--- a/cpufrequtils/patches/cpufrequtils-008-no-aperf-on-ppc.patch
+++ /dev/null
@@ -1,45 +0,0 @@
---- cpufrequtils-008/Makefile 2011-02-10 13:04:49.235589962 +0100
-+++ cpufrequtils-008/Makefile.new 2011-02-10 13:08:00.481589942 +0100
-@@ -118,7 +118,7 @@
- CPPFLAGS += -DVERSION=\"$(VERSION)\" -DPACKAGE=\"$(PACKAGE)\" \
- -DPACKAGE_BUGREPORT=\"$(PACKAGE_BUGREPORT)\" -D_GNU_SOURCE
-
--UTIL_SRC = utils/info.c utils/set.c utils/aperf.c utils/cpuid.h
-+UTIL_SRC = utils/info.c utils/set.c
- LIB_HEADERS = lib/cpufreq.h lib/interfaces.h
- LIB_SRC = lib/cpufreq.c
- LIB_OBJS = lib/cpufreq.o
-@@ -199,7 +199,7 @@
- $(QUIET) $(CC) $(CFLAGS) $(LDFLAGS) -L. -o $@ utils/$@.o -lcpufreq
- $(QUIET) $(STRIPCMD) $@
-
--utils: cpufreq-info cpufreq-set cpufreq-aperf
-+utils: cpufreq-info cpufreq-set
-
- po/$(PACKAGE).pot: $(UTIL_SRC)
- @xgettext --default-domain=$(PACKAGE) --add-comments \
-@@ -229,7 +229,7 @@
- clean:
- -find . \( -not -type d \) -and \( -name '*~' -o -name '*.[oas]' \) -type f -print \
- | xargs rm -f
-- -rm -f cpufreq-info cpufreq-set cpufreq-aperf
-+ -rm -f cpufreq-info cpufreq-set
- -rm -f libcpufreq.so*
- -rm -f build/ccdv
- -rm -rf po/*.gmo po/*.pot
-@@ -246,7 +246,6 @@
- $(INSTALL) -d $(DESTDIR)${bindir}
- $(INSTALL_PROGRAM) cpufreq-set $(DESTDIR)${bindir}/cpufreq-set
- $(INSTALL_PROGRAM) cpufreq-info $(DESTDIR)${bindir}/cpufreq-info
-- $(INSTALL_PROGRAM) cpufreq-aperf $(DESTDIR)${bindir}/cpufreq-aperf
-
- install-man:
- $(INSTALL_DATA) -D man/cpufreq-set.1 $(DESTDIR)${mandir}/man1/cpufreq-set.1
-@@ -270,7 +269,6 @@
- - rm -f $(DESTDIR)${includedir}/cpufreq.h
- - rm -f $(DESTDIR)${bindir}/cpufreq-set
- - rm -f $(DESTDIR)${bindir}/cpufreq-info
-- - rm -f $(DESTDIR)${bindir}/cpufreq-aperf
- - rm -f $(DESTDIR)${mandir}/man1/cpufreq-set.1
- - rm -f $(DESTDIR)${mandir}/man1/cpufreq-info.1
- - for HLANG in $(LANGUAGES); do \
diff --git a/cpufrequtils/patches/cpufrequtils-multilib.patch b/cpufrequtils/patches/cpufrequtils-multilib.patch
deleted file mode 100644
index cc4d8d2..0000000
--- a/cpufrequtils/patches/cpufrequtils-multilib.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- cpufrequtils-008/Makefile 2010-07-05 17:43:17.000000000 +0200
-+++ Makefile.multilib 2010-07-16 11:31:40.294161413 +0200
-@@ -206,6 +206,9 @@
- --keyword=_ --keyword=N_ $(UTIL_SRC) && \
- test -f $(PACKAGE).po && \
- mv -f $(PACKAGE).po po/$(PACKAGE).pot
-+# Avoid multilib issues by forcing the POT creation date
-+ sed -i 's/POT-Creation-Date: .*\\/Pot-Creation-Date: 2010-07-16 11:00+0200\\/' \
-+ po/${PACKAGE}.pot
-
- update-gmo: po/$(PACKAGE).pot
- @for HLANG in $(LANGUAGES); do \
diff --git a/cpufrequtils/patches/disable-gsic.patch b/cpufrequtils/patches/disable-gsic.patch
deleted file mode 100644
index ccf059c..0000000
--- a/cpufrequtils/patches/disable-gsic.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- cpufrequtils-0.3/debug/i386/Makefile~ 2004-12-04 15:58:54.287473296 -0500
-+++ cpufrequtils-0.3/debug/i386/Makefile 2004-12-04 15:59:08.035383296 -0500
-@@ -12,7 +12,7 @@ intel_gsic: intel_gsic.c
- powernow-k8-decode: powernow-k8-decode.c
- $(CC) $(CFLAGS) -o powernow-k8-decode powernow-k8-decode.c
-
--all: centrino-decode dump_psb intel_gsic powernow-k8-decode
-+all: centrino-decode dump_psb powernow-k8-decode
-
- clean:
- rm -rf centrino-decode dump_psb intel_gsic powernow-k8-decode
diff --git a/freeradius/freeradius.nm b/freeradius/freeradius.nm
index a9ea8be..eec0ec2 100644
--- a/freeradius/freeradius.nm
+++ b/freeradius/freeradius.nm
@@ -3,9 +3,10 @@
# Copyright (C) - IPFire Development Team <info(a)ipfire.org> #
###############################################################################
-name = freeradius-server
+name = freeradius
version = 2.1.12
-release = 3
+release = 4
+thisapp = %{name}-server-%{version}
groups = System/Daemons
url = http://www.freeradius.org
@@ -37,9 +38,7 @@ build
configure_options +=\
%{CONFIGURE_ARCH} \
- --sysconfdir=/etc \
- --libdir=/usr/lib/freeradius \
- --localstatedir=/var \
+ --libdir=%{libdir}/freeradius \
--with-system-libtool \
--with-threads \
--with-thread-pool \
@@ -97,7 +96,7 @@ end
quality-agent
whitelist_rpath
- /usr/lib/freeradius
+ %{libdir}/freeradius
end
end
@@ -107,7 +106,10 @@ packages
/etc/raddb/radiusd.conf
end
- prerequires = shadow-utils systemd-units
+ prerequires
+ shadow-utils
+ systemd-units
+ end
script prein
%{create_user}
diff --git a/gettext/gettext.nm b/gettext/gettext.nm
index 98a5fca..3416a0a 100644
--- a/gettext/gettext.nm
+++ b/gettext/gettext.nm
@@ -5,7 +5,7 @@
name = gettext
version = 0.18.1.1
-release = 6
+release = 7
groups = System/Base
url = http://www.gnu.org/software/gettext/
@@ -73,6 +73,7 @@ packages
requires
gettext-common-devel=%{thisver}
gettext-libs=%{thisver}
+ git
end
files += \
diff --git a/xorg-x11-proto-devel/xorg-x11-proto-devel.nm b/xorg-x11-proto-devel/xorg-x11-proto-devel.nm
index 610c7ad..02b5473 100644
--- a/xorg-x11-proto-devel/xorg-x11-proto-devel.nm
+++ b/xorg-x11-proto-devel/xorg-x11-proto-devel.nm
@@ -5,7 +5,7 @@
name = xorg-x11-proto-devel
version = 7.4
-release = 2
+release = 3
arch = noarch
maintainer = Stefan Schantl <stefan.schantl(a)ipfire.org>
@@ -58,6 +58,11 @@ build
done
end
+ # Place the .pc files in /usr/share so they
+ # can be found on all architectures where libdir != /usr/lib.
+ configure_options += \
+ --libdir=%{datadir}
+
build
for object in %{sources}; do
cd %{DIR_SRC}/${object%*.tar.bz2}
@@ -78,5 +83,4 @@ end
packages
package %{name}
- end
end
hooks/post-receive
--
IPFire 3.x development tree
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2012-03-10 11:10 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-03-10 11:10 [IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. d137cccc3d39f9036ca5f02cecc5604a9f5a51bd git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox