update: apr, libarchive

built with rpm-4.8.1: apr, hal


git-svn-id: http://trac.vinelinux.org/repos/projects/specs@1872 ec354946-7b23-47d6-9f5a-488ba84defc7

a/apr/apr-vl.spec

@@ -3,22 +3,26 @@
 # Arches on which the multilib apr.h hack is needed:
 %define multilib_arches %{ix86} ia64 ppc ppc64 s390 s390x x86_64
 
+Name: apr
 Summary: Apache Portable Runtime library
 Summary(ja): Apache ポータブルランタイムライブラリ
-Name: apr
-Version: 1.3.9
-Release: 2%{?_dist_release}
-License: Apache Software License
+Version: 1.4.2
+Release: 1%{?_dist_release}
+
 Group: System Environment/Libraries
+License: Apache Software License
 URL: http://apr.apache.org/
+
 Source0: %{name}-%{version}.tar.bz2
 Source1: apr-wrapper.h
 Patch2: apr-0.9.7-deepbind.patch
 Patch3: apr-1.2.2-locktimeout.patch
 Patch4: apr-1.2.2-libdir.patch
 Patch5: apr-1.3.3-pkgconf.patch
+
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-BuildRequires: autoconf, libtool, doxygen, e2fsprogs-devel
+BuildRequires: autoconf, libtool, python, doxygen
+BuildRequires: libuuid-devel
 Conflicts: subversion < 0.20.1-2
 Obsoletes: apache2-apr
 
@@ -29,13 +33,12 @@ portability layer to as many operating systems as possible,
 including Unices, MS Win32, BeOS and OS/2.
 
 %package devel
-Group: Development/Libraries
 Summary: APR library development kit
 Summary(ja): APR ライブラリ開発キット
+Group: Development/Libraries
+Requires: %{name} = %{version}-%{release}
 Conflicts: subversion-devel < 0.20.1-2
 Obsoletes: apache2-apr-devel
-Requires: apr = %{version}-%{release}
-Requires: pkgconfig
 
 %description devel
 This package provides the support files which can be used to 
@@ -62,6 +65,7 @@ export ac_cv_search_shm_open=no
         --includedir=%{_includedir}/apr-%{aprver} \
         --with-installbuilddir=%{_libdir}/apr-%{aprver}/build \
         --with-devrandom=/dev/urandom \
+        --disable-static \
         CC=gcc CXX=g++
 make %{?_smp_mflags} && make dox
 
@@ -121,7 +125,7 @@ rm -rf $RPM_BUILD_ROOT
 %doc docs/incomplete_types docs/non_apr_programs
 %doc --parents html
 %{_bindir}/apr-%{aprver}-config
-%{_libdir}/libapr-%{aprver}.a
+#{_libdir}/libapr-%{aprver}.a
 %{_libdir}/libapr-%{aprver}.so
 %{_libdir}/pkgconfig/*.pc
 %dir %{_libdir}/apr-%{aprver}
@@ -131,6 +135,11 @@ rm -rf $RPM_BUILD_ROOT
 %{_includedir}/apr-%{aprver}/*.h
 
 %changelog
+* Wed Sep 22 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> - 1.4.2-1
+- new upstream release
+- built with rpm-4.8.1
+- removed static libraries from devel package
+
 * Fri Feb 12 2010 MATSUBAYASHI Kohji <shaolin@vinelinux.org> - 1.3.10-1
 - rebuilt with new toolchain
 

h/hal/hal-vl.spec

@@ -25,10 +25,11 @@ Summary: Hardware Abstraction Layer
 Summary(ja): ハードウエア抽象化レイヤ
 Name: hal
 Version: 0.5.13
-Release: 3%{?_dist_release}
+Release: 4%{?_dist_release}
+
+Group: System Environment/Libraries
 URL: http://www.freedesktop.org/Software/hal
 License: AFL/GPL
-Group: System Environment/Libraries
 
 Source0: %{name}-%{version}.tar.gz
 
@@ -51,7 +52,6 @@ Patch100: hal-use-at-console.patch
 Patch200: hal-0.5.13-disable-keyboard-hotplug.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
-Requires: chkconfig
 BuildRequires: expat-devel >= %{expat_version}
 BuildRequires: glib2-devel >= %{glib2_version}
 BuildRequires: dbus-devel  >= %{dbus_version}
@@ -81,6 +81,10 @@ Requires: libusb >= %{libusb_version}
 Requires: ConsoleKit >= %{consolekit_version}
 Requires: acl >= %{acl_version}
 Requires: hal-info
+Requires(pre): shadow-utils 
+Requires(post): chkconfig
+Requires(preun): chkconfig, initscripts
+
 Obsoletes: hal-gnome
 
 %description
@@ -104,11 +108,10 @@ GNOME program for displaying the devices detected by HAL
 %package devel
 Summary: Libraries and headers for HAL
 Group: Development/Libraries
-Requires: %name = %{version}-%{release}
+Requires: %{name} = %{version}-%{release}
 Requires: dbus-devel >= %{dbus_version}
 
 %description devel
-
 Headers, static libraries and API docs for HAL.
 
 
@@ -157,7 +160,7 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/*.{a,la}
 
 
 %clean
-rm -rf %{buildroot}
+rm -rf $RPM_BUILD_ROOT
 
 
 %pre
@@ -165,10 +168,6 @@ rm -rf %{buildroot}
 /usr/sbin/useradd -c 'HAL daemon' -u %{hal_user_uid} \
 	-s /sbin/nologin -r -d '/' haldaemon 2> /dev/null || :
 
-# User haldaemon needs to be able to read authorizations
-/usr/bin/polkit-auth --user haldaemon --grant org.freedesktop.policykit.read >& /dev/null || :
-
-
 %post
 /sbin/ldconfig
 /sbin/chkconfig --add haldaemon
@@ -208,7 +207,7 @@ fi
 %files
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING ChangeLog HACKING INSTALL README NEWS
-%doc examples
+#doc examples
 
 %dir %{_sysconfdir}/dbus-1/system.d
 %{_sysconfdir}/dbus-1/system.d/*
@@ -235,7 +234,6 @@ fi
 
 %{_sysconfdir}/udev/rules.d/90-hal.rules
 
-
 %attr(0700,haldaemon,haldaemon) %dir %{_localstatedir}/cache/hald
 %attr(0700,haldaemon,haldaemon) %dir %{_localstatedir}/run/hald
 
@@ -256,6 +254,9 @@ fi
 
 
 %changelog
+* Wed Sep 22 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 0.5.13-4
+- rebuilt with rpm-4.8.1 for pkg-config
+
 * Mon Feb 08 2010 Yoji TOYODA <bsyamato@sea.plala.or.jp> 0.5.13-3
 - add BuildRequires: libuuid-devel
 

lib/liba/libarchive/libarchive-vl.spec

@@ -1,14 +1,15 @@
-Name:           libarchive
-Version:        2.8.3
-Release:        1%{?_dist_release}
-Summary:        A library for handling streaming archive formats 
+Name:          libarchive
+Summary:       A library for handling streaming archive formats 
+Version:       2.8.4
+Release:       1%{?_dist_release}
 
-Group:          System Environment/Libraries
-License:        BSD
-URL:            http://people.freebsd.org/~kientzle/libarchive/
-Source0:        http://people.freebsd.org/~kientzle/libarchive/src/libarchive-%{version}.tar.gz
+Group:         System Environment/Libraries
+License:       BSD
+URL:           http://code.google.com/p/libarchive/
 
-BuildRoot:      %{_tmppath}/%{name}-%{version}-root
+Source0:       http://libarchive.googlecode.com/files/%{name}-%{version}.tar.gz
+
+BuildRoot:     %{_tmppath}/%{name}-%{version}-root
 BuildRequires: zlib-devel
 BuildRequires: bzip2-devel
 BuildRequires: libacl-devel
@@ -22,12 +23,12 @@ streaming archive formats, including most popular tar variants, several cpio
 formats, and both BSD and GNU ar variants. It can also write shar archives and 
 read ISO9660 CDROM images and ZIP archives.
 
-%package        devel
-Summary:        Development files for %{name}
-Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
+%package       devel
+Summary:       Development files for %{name}
+Group:         Development/Libraries
+Requires:      %{name} = %{version}-%{release}
 
-%description    devel
+%description   devel
 The %{name}-devel package contains libraries and header files for
 developing applications that use %{name}.
 
@@ -71,6 +72,9 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/*.pc
 
 %changelog
+* Sun Sep  5 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 2.8.4-1
+- new upstream release
+
 * Wed Apr 14 2010 Ryoichi INAGAKI <ryo1@bc.wakwak.com> 2.8.3-1
 - new upstream release
 - built with new toolchain