[svn] r6405 - in trunk/rpms: . dnsmasq dwdiff icu
packagers at lists.rpmforge.net
packagers at lists.rpmforge.net
Mon Jul 14 03:30:36 CEST 2008
Author: dag
Date: 2008-07-14 02:30:35 +0100 (Mon, 14 Jul 2008)
New Revision: 6405
Added:
trunk/rpms/dwdiff/
trunk/rpms/dwdiff/dwdiff.spec
trunk/rpms/icu/icu-2.6.spec
trunk/rpms/icu/icu.spec
Removed:
trunk/rpms/icu/icu.spec
Modified:
trunk/rpms/dnsmasq/dnsmasq.spec
Log:
Updates
Modified: trunk/rpms/dnsmasq/dnsmasq.spec
===================================================================
--- trunk/rpms/dnsmasq/dnsmasq.spec 2008-07-12 21:32:59 UTC (rev 6404)
+++ trunk/rpms/dnsmasq/dnsmasq.spec 2008-07-14 01:30:35 UTC (rev 6405)
@@ -4,7 +4,7 @@
Summary: Lightweight caching nameserver with integrated DHCP server
Name: dnsmasq
-Version: 2.42
+Version: 2.43
Release: 1
License: GPL
Group: System Environment/Daemons
@@ -156,6 +156,9 @@
%{_localstatedir}/lib/misc/
%changelog
+* Sat Jul 12 2008 Dag Wieers <dag at wieers.com> - 2.43-1
+- Updated to release 2.43.
+
* Tue Jun 03 2008 Dag Wieers <dag at wieers.com> - 2.42-1
- Updated to release 2.42.
Added: trunk/rpms/dwdiff/dwdiff.spec
===================================================================
--- trunk/rpms/dwdiff/dwdiff.spec (rev 0)
+++ trunk/rpms/dwdiff/dwdiff.spec 2008-07-14 01:30:35 UTC (rev 6405)
@@ -0,0 +1,64 @@
+# $Id$
+# Authority: dag
+
+%{?dtag: %{expand: %%define %dtag 1}}
+%{?rh7:%define _without_icu36 1}
+%{?el2:%define _without_icu36 1}
+
+Summary: Front end to diff for comparing files on a word per word basis
+Name: dwdiff
+Version: 1.4
+Release: 1
+License: OSL 2.0
+Group: Applications/Text
+URL: http://os.ghalkes.nl/dwdiff.html
+
+Source: http://os.ghalkes.nl/dist/dwdiff-%{version}.tgz
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+
+BuildRequires: gettext
+%{!?_without_icu36:BuildRequires: libicu-devel >= 3.6}
+Requires: diffutils
+
+%description
+dwdiff is a front-end for the diff program that operates at the word level
+instead of the line level. It is different from wdiff in that it allows the
+user to specify what should be considered whitespace, and in that it takes an
+optional list of characters that should be considered delimiters. Delimiters
+are single characters that are treated as if they are words, even when there
+is no whitespace separating them from preceding words or delimiters.
+
+%prep
+%setup
+
+%build
+export CFLAGS="%{optflags}"
+./configure \
+ --prefix="%{buildroot}%{_prefix}" \
+%{?_without_icu36:--without-unicode}
+%{__make} %{?_smp_mflags}
+
+%install
+%{__rm} -rf %{buildroot}
+%{__make} install DESTDIR="%{buildroot}"
+%find_lang %{name}
+
+### Move nl manpage
+%{__install} -Dp -m0644 %{buildroot}%{_mandir}/nl.UTF-8/man1/dwdiff.1 %{buildroot}%{_mandir}/nl/man1/dwdiff.1
+
+### Clean up buildroot
+%{__rm} -rf %{buildroot}%{_mandir}/nl.*/man1/
+
+%clean
+%{__rm} -rf %{buildroot}
+
+%files -f %{name}.lang
+%defattr(-, root, root, 0755)
+%doc Changelog COPYING README
+%doc %{_mandir}/man1/dwdiff.1*
+%lang(nl) %{_mandir}/nl/man1/dwdiff.1*
+%{_bindir}/dwdiff
+
+%changelog
+* Sun Jul 13 2008 Dag Wieers <dag at wieers.com> - 1.4-1
+- Initial package. (using DAR)
Property changes on: trunk/rpms/dwdiff/dwdiff.spec
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ native
Copied: trunk/rpms/icu/icu-2.6.spec (from rev 6404, trunk/rpms/icu/icu.spec)
===================================================================
--- trunk/rpms/icu/icu-2.6.spec (rev 0)
+++ trunk/rpms/icu/icu-2.6.spec 2008-07-14 01:30:35 UTC (rev 6405)
@@ -0,0 +1,104 @@
+# $Id$
+
+# Authority: dag
+
+### FIXME: Makefiles don't allow -jX (parallel compilation)
+# Distcc: 0
+
+Summary: International Components for Unicode
+Name: icu
+Version: 2.6.2
+Release: 1
+License: X License
+Group: System Environment/Libraries
+URL: http://oss.software.ibm.com/icu/
+
+Source: ftp://www-126.ibm.com/pub/icu/2.6.2/icu-%{version}.tgz
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+BuildRequires: gcc-c++
+
+%description
+ICU is a C++ and C library that provides robust and full-featured Unicode
+support. This package contains the runtime libraries for ICU. It does not
+contain any of the data files needed at runtime and present in the `icu'
+and `icu-locales` packages.
+
+%package -n libicu
+Summary: International Components for Unicode
+Group: System Environment/Libraries
+
+%description -n libicu
+ICU is a C++ and C library that provides robust and full-featured Unicode
+support. This package contains the runtime libraries for ICU. It does not
+contain any of the data files needed at runtime and present in the `icu'
+and `icu-locales` packages.
+
+%package -n libicu-devel
+Summary: Header files, libraries and development documentation for %{name}
+Group: Development/Libraries
+Requires: libicu = %{version}-%{release}
+
+%description -n libicu-devel
+This package contains the header files, static libraries and development
+documentation for %{name}. If you like to develop programs using %{name},
+you will need to install %{name}-devel.
+
+%prep
+%setup -n %{name}
+
+%build
+cd source
+CFLAGS="-O3" \
+CXXFLAGS="-O3" \
+%configure \
+ --disable-samples
+%{__make} %{?_smp_mflags}
+
+%install
+%{__rm} -rf %{buildroot}
+cd source
+%makeinstall
+
+%post -n libicu
+/sbin/ldconfig 2>/dev/null
+
+%postun -n libicu
+/sbin/ldconfig 2>/dev/null
+
+%clean
+%{__rm} -rf %{buildroot}
+
+%files
+%defattr(-, root, root, 0755)
+%doc license.html readme.html
+%doc %{_mandir}/man?/*
+%{_sysconfdir}/icu/
+%{_bindir}/*
+%{_sbindir}/*
+%dir %{_datadir}/icu/
+%{_datadir}/icu/%{version}/mkinstalldirs
+%{_datadir}/icu/%{version}/license.html
+
+%files -n libicu
+%defattr(-, root, root, 0755)
+%doc license.html
+%{_libdir}/*.so.*
+
+%files -n libicu-devel
+%defattr(-, root, root, 0755)
+%doc %{_datadir}/icu/%{version}/README
+%dir %{_libdir}/icu/
+%dir %{_datadir}/icu/
+%{_includedir}/layout/
+%{_includedir}/unicode/
+%{_libdir}/*.so
+%{_libdir}/icu/Makefile.inc
+%{_libdir}/icu/%{version}/Makefile.inc
+%{_datadir}/icu/%{version}/config/mh-linux
+
+%changelog
+* Wed Feb 25 2004 Dag Wieers <dag at wieers.com> - 2.6.2-1
+- Fixed a typo in the dependencies "libuci" should be "libicu". (Daniel Demus)
+
+* Wed Feb 25 2004 Dag Wieers <dag at wieers.com> - 2.6.2-0
+- Initial package. (using DAR)
Deleted: trunk/rpms/icu/icu.spec
===================================================================
--- trunk/rpms/icu/icu.spec 2008-07-12 21:32:59 UTC (rev 6404)
+++ trunk/rpms/icu/icu.spec 2008-07-14 01:30:35 UTC (rev 6405)
@@ -1,104 +0,0 @@
-# $Id$
-
-# Authority: dag
-
-### FIXME: Makefiles don't allow -jX (parallel compilation)
-# Distcc: 0
-
-Summary: International Components for Unicode
-Name: icu
-Version: 2.6.2
-Release: 1
-License: X License
-Group: System Environment/Libraries
-URL: http://oss.software.ibm.com/icu/
-
-Source: ftp://www-126.ibm.com/pub/icu/2.6.2/icu-%{version}.tgz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires: gcc-c++
-
-%description
-ICU is a C++ and C library that provides robust and full-featured Unicode
-support. This package contains the runtime libraries for ICU. It does not
-contain any of the data files needed at runtime and present in the `icu'
-and `icu-locales` packages.
-
-%package -n libicu
-Summary: International Components for Unicode
-Group: System Environment/Libraries
-
-%description -n libicu
-ICU is a C++ and C library that provides robust and full-featured Unicode
-support. This package contains the runtime libraries for ICU. It does not
-contain any of the data files needed at runtime and present in the `icu'
-and `icu-locales` packages.
-
-%package -n libicu-devel
-Summary: Header files, libraries and development documentation for %{name}
-Group: Development/Libraries
-Requires: libicu = %{version}-%{release}
-
-%description -n libicu-devel
-This package contains the header files, static libraries and development
-documentation for %{name}. If you like to develop programs using %{name},
-you will need to install %{name}-devel.
-
-%prep
-%setup -n %{name}
-
-%build
-cd source
-CFLAGS="-O3" \
-CXXFLAGS="-O3" \
-%configure \
- --disable-samples
-%{__make} %{?_smp_mflags}
-
-%install
-%{__rm} -rf %{buildroot}
-cd source
-%makeinstall
-
-%post -n libicu
-/sbin/ldconfig 2>/dev/null
-
-%postun -n libicu
-/sbin/ldconfig 2>/dev/null
-
-%clean
-%{__rm} -rf %{buildroot}
-
-%files
-%defattr(-, root, root, 0755)
-%doc license.html readme.html
-%doc %{_mandir}/man?/*
-%{_sysconfdir}/icu/
-%{_bindir}/*
-%{_sbindir}/*
-%dir %{_datadir}/icu/
-%{_datadir}/icu/%{version}/mkinstalldirs
-%{_datadir}/icu/%{version}/license.html
-
-%files -n libicu
-%defattr(-, root, root, 0755)
-%doc license.html
-%{_libdir}/*.so.*
-
-%files -n libicu-devel
-%defattr(-, root, root, 0755)
-%doc %{_datadir}/icu/%{version}/README
-%dir %{_libdir}/icu/
-%dir %{_datadir}/icu/
-%{_includedir}/layout/
-%{_includedir}/unicode/
-%{_libdir}/*.so
-%{_libdir}/icu/Makefile.inc
-%{_libdir}/icu/%{version}/Makefile.inc
-%{_datadir}/icu/%{version}/config/mh-linux
-
-%changelog
-* Wed Feb 25 2004 Dag Wieers <dag at wieers.com> - 2.6.2-1
-- Fixed a typo in the dependencies "libuci" should be "libicu". (Daniel Demus)
-
-* Wed Feb 25 2004 Dag Wieers <dag at wieers.com> - 2.6.2-0
-- Initial package. (using DAR)
Added: trunk/rpms/icu/icu.spec
===================================================================
--- trunk/rpms/icu/icu.spec (rev 0)
+++ trunk/rpms/icu/icu.spec 2008-07-14 01:30:35 UTC (rev 6405)
@@ -0,0 +1,179 @@
+# $Id$
+# Authority: dag
+
+### RHEL5 already ships with icu 3.6
+# ExclusiveDist: el2 rh7 rh9 el3 el4
+
+%{?dtag: %{expand: %%define %dtag 1}}
+
+%{?rh9:%define _without_doxygen13 1}
+%{?rh7:%define _without_doxygen13 1}
+%{?el2:%define _without_doxygen13 1}
+
+%define real_name icu4c
+%define real_version 3_6
+
+Summary: International Components for Unicode
+Name: icu
+Version: 3.6
+Release: 1
+License: X License
+Group: System Environment/Libraries
+URL: http://www.ibm.com/software/globalization/icu/
+
+Source0: ftp://ftp.software.ibm.com/software/globalization/icu/%{version}/icu4c-%{real_version}-src.tgz
+Source1: icu-config
+Patch1: icu-3.4-multiarchdevel.patch
+Patch3: icu.icu5365.dependantvowels.patch
+Patch4: icu.icu5418.malayam.patch
+Patch5: icu.icu5431.malayam.patch
+Patch6: icu.icu5433.oriya.patch
+Patch7: icu.icuXXXX.virama.prevnext.patch
+Patch8: icu.icu5465.telegu.patch
+Patch9: icu.icu5488.assamese.patch
+Patch10: icu.icu5500.devicetablecrash.patch
+Patch11: icu.icu5501.sinhala.biggerexpand.patch
+Patch12: icu.icu5557.safety.patch
+Patch13: icu.icu5506.multiplevowels.patch
+Patch14: icu.icu5594.gujarati.patch
+Patch15: icu.icuXXXX.malayalam.bysyllable.patch
+Patch16: icu.regexp.patch
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
+
+BuildRequires: gcc-c++
+%{!?_without_doxygen13:BuildRequires: doxygen >= 1.3}
+
+%description
+ICU is a C++ and C library that provides robust and full-featured Unicode
+support. This package contains the runtime libraries for ICU. It does not
+contain any of the data files needed at runtime and present in the `icu'
+and `icu-locales` packages.
+
+%package -n libicu
+Summary: International Components for Unicode
+Group: System Environment/Libraries
+
+%description -n libicu
+ICU is a C++ and C library that provides robust and full-featured Unicode
+support. This package contains the runtime libraries for ICU. It does not
+contain any of the data files needed at runtime and present in the `icu'
+and `icu-locales` packages.
+
+%package -n libicu-devel
+Summary: Header files, libraries and development documentation for %{name}
+Group: Development/Libraries
+Requires: libicu = %{version}-%{release}
+Requires: pkgconfig
+
+%description -n libicu-devel
+This package contains the header files, static libraries and development
+documentation for %{name}. If you like to develop programs using %{name},
+you will need to install %{name}-devel.
+
+%package -n libicu-doc
+Summary: Development documentation for %{name}
+Group: Documentation
+
+%description -n libicu-doc
+This package contains the development documentation for %{name}.
+
+%prep
+%setup -n %{name}
+%patch1 -p1 -b .multiarchdevel
+%patch3 -p1 -b .dependantvowels
+%patch4 -p1 -b .icu5418.malayam.patch
+%patch5 -p1 -b .icu5431.malayam.patch
+%patch6 -p1 -b .icu5433.oriya.patch
+%patch7 -p1 -b .icuXXXX.virama.prevnext.patch
+%patch8 -p1 -b .icu5465.telegu.patch
+%patch9 -p1 -b .icu5488.assamese.patch
+%patch10 -p1 -b .icu5500.devicetablecrash.patch
+%patch11 -p1 -b .icu5501.sinhala.biggerexpand.patch
+%patch12 -p1 -b .icu5557.safety.patch
+%patch13 -p1 -b .icu5506.multiplevowels.patch
+%patch15 -p1 -b .icuXXXX.malayalam.bysyllable.patch
+%patch16 -p1 -b .regexp.patch
+
+%build
+cd source
+export CFLAGS="%{optflags} -fno-strict-aliasing"
+export CXXFLAGS="%{optflags} -fno-strict-aliasing"
+autoconf
+%configure \
+ --disable-samples \
+ --with-data-packaging="library"
+%{__make} #%{?_smp_mflags}
+%{__make} doc || :
+
+%install
+%{__rm} -rf %{buildroot}
+%{__make} -C source install DESTDIR="%{buildroot}"
+%{__make} -C source install-doc docdir="rpm-doc" || :
+%{__chmod} +x %{buildroot}%{_libdir}/*.so.*
+%{__install} -Dp -m0755 %{SOURCE1} %{buildroot}%{_bindir}/icu-config
+
+%{__perl} -pi -e '
+ s|\$\(THREADSCXXFLAGS\)||;
+ s|\$\(THREADSCPPFLAGS\)|-D_REENTRANT|;
+ ' %{buildroot}%{_libdir}/pkgconfig/icu.pc
+
+%post -n libicu -p /sbin/ldconfig
+%postun -n libicu -p /sbin/ldconfig
+
+%clean
+%{__rm} -rf %{buildroot}
+
+%files
+%defattr(-, root, root, 0755)
+%doc license.html readme.html
+%doc %{_mandir}/man1/derb.1*
+%doc %{_mandir}/man1/genbrk.1*
+%doc %{_mandir}/man1/gencnval.1*
+%doc %{_mandir}/man1/genctd.1*
+%doc %{_mandir}/man1/genrb.1*
+%doc %{_mandir}/man1/makeconv.1*
+%doc %{_mandir}/man1/pkgdata.1*
+%doc %{_mandir}/man1/uconv.1*
+%doc %{_mandir}/man8/*.8*
+%{_bindir}/derb
+%{_bindir}/genbrk
+%{_bindir}/gencnval
+%{_bindir}/genctd
+%{_bindir}/genrb
+%{_bindir}/makeconv
+%{_bindir}/pkgdata
+%{_bindir}/uconv
+%{_sbindir}/*
+
+%files -n libicu
+%defattr(-, root, root, 0755)
+%doc license.html
+%{_libdir}/*.so.*
+
+%files -n libicu-devel
+%defattr(-, root, root, 0755)
+%doc %{_mandir}/man1/icu-config.1*
+%{_bindir}/icu-config
+%{_datadir}/icu/
+%{_includedir}/layout/
+%{_includedir}/unicode/
+%{_libdir}/*.so
+%{_libdir}/icu/
+%{_libdir}/pkgconfig/icu.pc
+
+%if %{!?_without_doxygen13:1}0
+%files -n libicu-doc
+%defattr(-, root, root, 0755)
+%doc source/rpm-doc/icu/html/*
+%endif
+
+%changelog
+* Sun Jul 13 2008 Dag Wieers <dag at wieers.com> - 3.6-1
+- Updated to release 3.6.
+- Included Fedora patches.
+
+* Wed Feb 25 2004 Dag Wieers <dag at wieers.com> - 2.6.2-1
+- Fixed a typo in the dependencies "libuci" should be "libicu". (Daniel Demus)
+
+* Wed Feb 25 2004 Dag Wieers <dag at wieers.com> - 2.6.2-0
+- Initial package. (using DAR)
Property changes on: trunk/rpms/icu/icu.spec
___________________________________________________________________
Name: svn:keywords
+ Id Revision
Name: svn:eol-style
+ native
More information about the svn-commits
mailing list