* [IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 897927666dbcf3294678a30842cda9adaeafb7d8
@ 2012-03-18 10:39 git
0 siblings, 0 replies; only message in thread
From: git @ 2012-03-18 10:39 UTC (permalink / raw)
To: ipfire-scm
[-- Attachment #1: Type: text/plain, Size: 7433 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 897927666dbcf3294678a30842cda9adaeafb7d8 (commit)
via c428a2f02039d77fc74efb0540668545889ed38c (commit)
via 94d514360243e08992a840d8570c82fd03c7e603 (commit)
via dedd592998173ee714fa19095b8a138854142ef0 (commit)
from 0595faf57fbea389bfb9e63b3d2ea8cf290a17eb (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 897927666dbcf3294678a30842cda9adaeafb7d8
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Mar 18 11:35:57 2012 +0100
pakfire: Add patch from upstream to fix pkgconfig dependencies.
pkgconfig was added to the provides list instead of the requires
list when a .pc file was in the package.
commit c428a2f02039d77fc74efb0540668545889ed38c
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Mar 18 11:34:05 2012 +0100
udev: Add scriptlets.
These scriptlets create required system user accounts and
restart udev when an update is done.
commit 94d514360243e08992a840d8570c82fd03c7e603
Merge: dedd592 0595faf
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Mar 18 11:33:51 2012 +0100
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-3.x
commit dedd592998173ee714fa19095b8a138854142ef0
Author: Michael Tremer <michael.tremer(a)ipfire.org>
Date: Sun Mar 18 11:33:22 2012 +0100
expat: Move libs to /usr.
Also cleans up the make file a little bit.
-----------------------------------------------------------------------
Summary of changes:
expat/expat.nm | 26 ++++----------
pakfire/pakfire.nm | 2 +-
.../patches/pakfire-0.9.20-pkgconfig-deps.patch | 37 ++++++++++++++++++++
udev/udev.nm | 30 ++++++++++++----
4 files changed, 68 insertions(+), 27 deletions(-)
create mode 100644 pakfire/patches/pakfire-0.9.20-pkgconfig-deps.patch
Difference in files:
diff --git a/expat/expat.nm b/expat/expat.nm
index 535a79a..2c79f96 100644
--- a/expat/expat.nm
+++ b/expat/expat.nm
@@ -5,7 +5,7 @@
name = expat
version = 2.0.1
-release = 2
+release = 3
groups = System/Libraries
url = http://www.libexpat.org/
@@ -13,30 +13,18 @@ license = MIT
summary = An XML parser library.
description
- This is expat, the C library for parsing XML, written by James Clark. Expat \
- is a stream oriented XML parser. This means that you register handlers with \
- the parser prior to starting the parse. These handlers are called when the \
- parser discovers the associated structures in the document being parsed. A \
- start tag is an example of the kind of structures for which you may \
+ This is expat, the C library for parsing XML, written by James Clark. Expat
+ is a stream oriented XML parser. This means that you register handlers with
+ the parser prior to starting the parse. These handlers are called when the
+ parser discovers the associated structures in the document being parsed. A
+ start tag is an example of the kind of structures for which you may
register handlers.
end
-source_dl =
-
-build
- configure_options += \
- --libdir=/%{lib}
-
- install_cmds
- rm -vf %{BUILDROOT}/%{lib}/libexpat.so
- mkdir -pv %{BUILDROOT}%{libdir}
- ln -svf ../../%{lib}/libexpat.so.1 %{BUILDROOT}%{libdir}/libexpat.so
- end
-end
+source_dl = http://downloads.sourceforge.net/project/expat/expat/%{version}/
packages
package %{name}
- end
package %{name}-devel
template DEVEL
diff --git a/pakfire/pakfire.nm b/pakfire/pakfire.nm
index 3217f43..f615de8 100644
--- a/pakfire/pakfire.nm
+++ b/pakfire/pakfire.nm
@@ -5,7 +5,7 @@
name = pakfire
version = 0.9.20
-release = 6
+release = 7
maintainer = Michael Tremer <michael.tremer(a)ipfire.org>
groups = System/Packaging
diff --git a/pakfire/patches/pakfire-0.9.20-pkgconfig-deps.patch b/pakfire/patches/pakfire-0.9.20-pkgconfig-deps.patch
new file mode 100644
index 0000000..1304cb9
--- /dev/null
+++ b/pakfire/patches/pakfire-0.9.20-pkgconfig-deps.patch
@@ -0,0 +1,37 @@
+commit 6230230c96c4961d6e5e7aed176d4859dd744b03
+Author: Michael Tremer <michael.tremer(a)ipfire.org>
+Date: Sat Mar 17 13:12:57 2012 +0100
+
+ Fix automatic pkgconfig dependencies.
+
+ The pkgconfig package was added as "provides" instead of a
+ dependency when .pc files were in a package.
+
+diff --git a/tools/find-provides b/tools/find-provides
+index 8a3e3cb..0be2de7 100755
+--- a/tools/find-provides
++++ b/tools/find-provides
+@@ -81,9 +81,6 @@ if [ -n "${pkgconfig}" -a -x "${pkgconfig}" ]; then
+ # We have a dependency. Make a note that we need the pkgconfig
+ # tool for this package.
+ echo "pkgconfig(${n}) ${r} ${v}"
+-
+- # The dependency on the pkgconfig package itself.
+- echo "pkgconfig"
+ done
+ done | sort -u
+ fi
+diff --git a/tools/find-requires b/tools/find-requires
+index 044c59f..9a98c32 100755
+--- a/tools/find-requires
++++ b/tools/find-requires
+@@ -142,6 +142,9 @@ fi
+ pkgconfig=$(which pkg-config)
+ if [ -n "${pkgconfig}" -a -x "${pkgconfig}" ]; then
+ for file in ${pkgconfig_files}; do
++ # The dependency for the pkgconfig package itself.
++ echo "pkgconfig"
++
+ ${pkgconfig} --print-requires --print-requires-private "${file}" 2> /dev/null | while read n r v ; do
+ echo "pkgconfig(${n})" "${r}" "${v}"
+ done
diff --git a/udev/udev.nm b/udev/udev.nm
index 8ea216a..8552dfe 100644
--- a/udev/udev.nm
+++ b/udev/udev.nm
@@ -5,7 +5,7 @@
name = udev
version = 181
-release = 1
+release = 2
groups = System/Base
url = ftp://ftp.kernel.org/pub/linux/utils/kernel/hotplug/
@@ -47,17 +47,33 @@ build
--with-rootlibdir=/%{lib} \
--with-selinux \
--with-systemdsystemunitdir=/lib/systemd/system
-
- install_cmds
- rm -vf %{BUILDROOT}/%{lib}/lib{udev,gudev-1.0}.so
- ln -svf ../../%{lib}/libudev.so.0 %{BUILDROOT}%{libdir}/libudev.so
- ln -svf ../../%{lib}/libgudev-1.0.so.0 %{BUILDROOT}%{libdir}/libgudev-1.0.so
- end
end
packages
package %{name}
groups += Base
+
+ prerequires
+ shadow-utils
+ systemd-units
+ end
+
+ script prein
+ getent group cdrom >/dev/null || groupadd -g 11 cdrom || :
+ getent group tape >/dev/null || groupadd -g 33 tape || :
+ getent group dialout >/dev/null || groupadd -g 18 dialout || :
+ getent group floppy >/dev/null || groupadd -g 19 floppy || :
+ systemctl stop udev.service udev-control.socket udev-kernel.socket >/dev/null 2>&1 || :
+ end
+
+ script postin
+ systemctl daemon-reload >/dev/null 2>&1 || :
+ systemctl start udev.service >/dev/null 2>&1 || :
+ end
+
+ script postun
+ systemctl daemon-reload >/dev/null 2>&1 || :
+ end
end
package lib%{name}
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-18 10:39 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-03-18 10:39 [IPFire-SCM] [git.ipfire.org] IPFire 3.x development tree branch, master, updated. 897927666dbcf3294678a30842cda9adaeafb7d8 git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox