From 774bfe25eaf817335d6f8d96da6addad737ace180c2a92a8d452abaa1ba345ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= Date: Mon, 26 Dec 2011 05:50:33 +0000 Subject: [PATCH 1/2] Accepting request 98213 from home:elvigia:branches:devel:libraries:c_c++ - Update to version 1.23 - Run spec cleaner OBS-URL: https://build.opensuse.org/request/show/98213 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libidn?expand=0&rev=13 --- libidn-1.22.tar.bz2 | 3 --- libidn-1.23.tar.gz | 3 +++ libidn.changes | 6 +++++ libidn.spec | 66 +++++++++++++++++++-------------------------- 4 files changed, 36 insertions(+), 42 deletions(-) delete mode 100644 libidn-1.22.tar.bz2 create mode 100644 libidn-1.23.tar.gz diff --git a/libidn-1.22.tar.bz2 b/libidn-1.22.tar.bz2 deleted file mode 100644 index 826d938..0000000 --- a/libidn-1.22.tar.bz2 +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:18573a32fe0ade5f955e21fe982954a494d1845993e0290e0a406e949039c613 -size 2858936 diff --git a/libidn-1.23.tar.gz b/libidn-1.23.tar.gz new file mode 100644 index 0000000..e220332 --- /dev/null +++ b/libidn-1.23.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:25b42d75851ebae52e1c969353b74eefd3d6817f41c8d2a6db258f5ec60c5e6a +size 3477618 diff --git a/libidn.changes b/libidn.changes index e00b9bb..8da0f09 100644 --- a/libidn.changes +++ b/libidn.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Mon Dec 26 05:47:14 UTC 2011 - crrodriguez@opensuse.org + +- Update to version 1.23 +- Run spec cleaner + ------------------------------------------------------------------- Sat Oct 1 01:39:54 UTC 2011 - crrodriguez@opensuse.org diff --git a/libidn.spec b/libidn.spec index 4c056b9..2291512 100644 --- a/libidn.spec +++ b/libidn.spec @@ -15,14 +15,13 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild Name: libidn -License: GPLv3 ; LGPLv2.1+ -Group: System/Libraries -Version: 1.22 +Version: 1.23 Release: 4 +License: GPL-3.0 ; LGPL-2.1+ +Group: System/Libraries # bug437293 %ifarch ppc64 Obsoletes: libidn-64bit @@ -30,11 +29,11 @@ Obsoletes: libidn-64bit # Summary: Support for Internationalized Domain Names (IDN) Url: http://www.gnu.org/software/libidn/ -Source0: http://josefsson.org/libidn/releases/libidn-%version.tar.bz2 +Source0: http://josefsson.org/libidn/releases/libidn-%{version}.tar.gz Source1: baselibs.conf -PreReq: %install_info_prereq -BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: pkgconfig +Requires(pre): %install_info_prereq +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description GNU Libidn is an implementation of the Stringprep, Punycode, and IDNA @@ -49,17 +48,12 @@ character handling. Profiles for iSCSI, Kerberos 5, Nameprep, SASL, and XMPP are included. Punycode and ASCII Compatible Encoding (ACE) via IDNA is supported. - - -Authors: --------- - Simon Josefsson - %package devel -License: LGPLv2.1+ -Requires: %{name} = %{version} glibc-devel +License: LGPL-2.1+ Summary: Include Files and Libraries mandatory for Development Group: System/Libraries +Requires: %{name} = %{version} +Requires: glibc-devel # bug437293 %ifarch ppc64 Obsoletes: libidn-devel-64bit @@ -79,24 +73,18 @@ character handling. Profiles for iSCSI, Kerberos 5, Nameprep, SASL, and XMPP are included. Punycode and ASCII Compatible Encoding (ACE) via IDNA is supported. - - -Authors: --------- - Simon Josefsson - %prep %setup -q %build %configure --with-pic --disable-static --disable-gtk-doc -%{__make} %{?jobs:-j%jobs} +make %{?_smp_mflags} %install -make DESTDIR=$RPM_BUILD_ROOT install -rm -f $RPM_BUILD_ROOT/%_infodir/dir +%make_install +rm -f %{buildroot}/%{_infodir}/dir rm -f %{buildroot}%{_libdir}/libidn.la -%find_lang %name +%find_lang %{name} %check %if ! 0%{?qemu_user_space_build} @@ -104,7 +92,7 @@ make check %endif %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %post /sbin/ldconfig @@ -114,23 +102,23 @@ rm -rf $RPM_BUILD_ROOT /sbin/ldconfig %install_info_delete --info-dir=%{_infodir} %{_infodir}/libidn.info.gz -%files -f %name.lang +%files -f %{name}.lang %defattr(-,root,root) -%dir %_prefix/share/emacs -%dir %_prefix/share/emacs/site-lisp +%dir %{_datadir}/emacs +%dir %{_datadir}/emacs/site-lisp %doc AUTHORS COPYING.LIB ChangeLog FAQ NEWS README THANKS TODO -%_libdir/libidn.so.* -%_infodir/libidn* -%_prefix/bin/idn -%_mandir/man1/idn.1.* -%_prefix/share/emacs/site-lisp/idna.el -%_prefix/share/emacs/site-lisp/punycode.el +%{_libdir}/libidn.so.* +%{_infodir}/libidn* +%{_bindir}/idn +%{_mandir}/man1/idn.1.* +%{_datadir}/emacs/site-lisp/idna.el +%{_datadir}/emacs/site-lisp/punycode.el %files devel %defattr(-,root,root) -%_libdir/libidn.so -/usr/include/*.h -%_libdir/pkgconfig/libidn.pc -%_mandir/man3/* +%{_libdir}/libidn.so +%{_includedir}/*.h +%{_libdir}/pkgconfig/libidn.pc +%{_mandir}/man3/* %changelog From e57b99ab51c25a69e5074ac8c752854d823206c8373040bbccf1b3210fc7853e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cristian=20Rodr=C3=ADguez?= Date: Mon, 26 Dec 2011 14:03:24 +0000 Subject: [PATCH 2/2] Accepting request 98241 from home:elvigia:branches:devel:libraries:c_c++ - fix URL OBS-URL: https://build.opensuse.org/request/show/98241 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/libidn?expand=0&rev=14 --- libidn.changes | 5 +++++ libidn.spec | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/libidn.changes b/libidn.changes index 8da0f09..2c57c94 100644 --- a/libidn.changes +++ b/libidn.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Dec 26 14:01:29 UTC 2011 - crrodriguez@opensuse.org + +- fix URL + ------------------------------------------------------------------- Mon Dec 26 05:47:14 UTC 2011 - crrodriguez@opensuse.org diff --git a/libidn.spec b/libidn.spec index 2291512..317126e 100644 --- a/libidn.spec +++ b/libidn.spec @@ -29,7 +29,7 @@ Obsoletes: libidn-64bit # Summary: Support for Internationalized Domain Names (IDN) Url: http://www.gnu.org/software/libidn/ -Source0: http://josefsson.org/libidn/releases/libidn-%{version}.tar.gz +Source0: http://ftp.gnu.org/gnu/libidn/libidn-%{version}.tar.gz Source1: baselibs.conf BuildRequires: pkgconfig Requires(pre): %install_info_prereq