Author: arekm Date: Tue Jul 26 16:10:14 2005 GMT Module: SPECS Tag: AC-branch ---- Log message: - merge from DEVEL
---- Files affected: SPECS: poldek.spec (1.197.2.11 -> 1.197.2.12) ---- Diffs: ================================================================ Index: SPECS/poldek.spec diff -u SPECS/poldek.spec:1.197.2.11 SPECS/poldek.spec:1.197.2.12 --- SPECS/poldek.spec:1.197.2.11 Mon Jul 25 15:46:23 2005 +++ SPECS/poldek.spec Tue Jul 26 18:10:09 2005 @@ -3,33 +3,30 @@ # Conditional build: %bcond_with static # don't use shared libraries %bcond_without imode # don't build interactive mode -%bcond_with curl # link with curl # # required versions (forced to avoid SEGV with mixed db used by rpm and poldek) %define ver_db 4.2.50-1 %define ver_rpm 4.4.1 +%define snap 20050613.22 Summary: RPM packages management helper tool Summary(pl): Pomocnicze narzędzie do zarządzania pakietami RPM Name: poldek -Version: 0.18.9 +Version: 0.19.0 Release: 0.2 License: GPL v2 Group: Applications/System -Source0: http://team.pld.org.pl/~mis/poldek/download/%{name}-%{version}.tar.bz2 -# Source0-md5: c49eb9086a7ee77e50c527f9c95e41aa +Source0: http://team.pld.org.pl/~mis/poldek/download/snapshots/%{name}-%{version}-cvs%{snap}.tar.bz2 +# Source0-md5: d529239d781c3d9e36577305d46d1a37 Source1: %{name}.conf -Patch0: %{name}-etc_dir.patch -Patch1: %{name}-retr_term.patch -Patch2: %{name}-simplestatic.patch -Patch3: %{name}-prereq.patch URL: http://team.pld.org.pl/~mis/poldek/ BuildRequires: automake BuildRequires: autoconf BuildRequires: bzip2-devel -%{?with_curl:BuildRequires: curl-devel >= 7.8} BuildRequires: db-devel >= %{ver_db} BuildRequires: gettext-autopoint -BuildRequires: openssl-devel >= 0.9.7d +BuildRequires: home-etc-devel +BuildRequires: libtool +BuildRequires: openssl-devel >= 0.9.7c BuildRequires: pcre-devel BuildRequires: perl-tools-pod BuildRequires: popt-devel @@ -38,10 +35,8 @@ BuildRequires: zlib-devel %if %{with static} BuildRequires: bzip2-static -%{?with_curl:BuildRequires: curl-static} BuildRequires: db-static >= %{ver_db} BuildRequires: glibc-static -BuildRequires: libselinux-static BuildRequires: ncurses-static BuildRequires: openssl-static BuildRequires: pcre-static @@ -50,11 +45,10 @@ BuildRequires: rpm-static BuildRequires: zlib-static %endif -Requires(triggerpostun): sed >= 4.0 Requires: db >= %{ver_db} +Requires: openssl >= 0.9.7c Requires: rpm >= %{ver_rpm} Requires: sed -Requires: openssl >= 0.9.7c BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description @@ -71,7 +65,7 @@ %{!?with_imode:This version hasn't got interactive mode.} -#' vim +%{!?with_imode:This version hasn't got interactive mode.} %description -l pl poldek jest narzędziem linii poleceń służącym do weryfikacji, @@ -87,24 +81,57 @@ %{!?with_imode:Ta wersja nie posiada trybu interaktywnego.} +%package libs +Summary: poldek library +Summary(pl): Biblioteki poldka +Group: Libraries + +%description libs +poldek library. + +%description libs -l pl +Biblioteki poldka. + +%package devel +Summary: Header files for poldek libraries +Summary(pl): Pliki nagłówkowe bibliotek poldka +Group: Development/Libraries +Requires: %{name}-libs = %{version}-%{release} + +%description devel +Header files for poldek libraries. + +%description devel -l pl +Pliki nagłówkowe bibliotek poldka. + +%package static +Summary: poldek static libraries +Summary(pl): Biblioteki statyczne poldka +Group: Development/Libraries +Requires: %{name}-devel = %{version}-%{release} + +%description static +poldek static libraries. + +%description static -l pl +Biblioteki statyczne poldka. + %prep -%setup -q -%patch0 -p1 -%patch1 -p1 -%patch2 -p0 -%patch3 -p1 +%setup -q -n %{name}-%{version}-cvs%{snap} %build %{__autopoint} %{__aclocal} -I m4 %{__autoconf} -%{__autoheader} %{__automake} cp -f config.sub trurlib +# glibc 2.3.5 workaround (to be removed when new snap come) +perl -pi -e 's|HAVE_FOPENCOOKIE|HAVE_FOPENCOOKIE_XXX|g' trurlib/nstream.c + %configure \ %{?with_static:--enable-static} \ %{!?with_imode:--disable-imode} \ - %{?with_curl:--with-curl} + --enable-nls %{__make} %install @@ -139,11 +166,8 @@ %find_lang %{name} -# no poldek-{devel,static} -rm -rf $RPM_BUILD_ROOT%{_includedir} -rm -rf $RPM_BUILD_ROOT%{_libdir}/lib*.a -rm -rf $RPM_BUILD_ROOT%{_libdir}/libtrurl.so.0.4.0 -rm -rf $RPM_BUILD_ROOT%{_libdir}/libtrurl.la +%post libs -p /sbin/ldconfig +%postun libs -p /sbin/ldconfig %clean rm -rf $RPM_BUILD_ROOT @@ -154,23 +178,43 @@ # otherwise don't touch %ifarch i386 i586 i686 ppc sparc alpha amd64 athlon %triggerpostun -- poldek <= 0.18.7-1 -sed -i -e 's://ftp.pld-linux.org://ftp.%{_target_cpu}.ac.pld-linux.org:g' /etc/poldek.conf +sed -i -e 's://ftp.pld-linux.org://ftp.ac.pld-linux.org:g' /etc/poldek.conf %endif %files -f %{name}.lang %defattr(644,root,root,755) -%doc README* NEWS TODO *sample* conf/poldekrc* -%attr(644,root,root) %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/%{name}.conf +%doc README* NEWS TODO conf/*.conf +%dir %{_sysconfdir}/%{name} +%attr(644,root,root) %config(noreplace) %verify(not md5 size mtime) %{_sysconfdir}/%{name}/*.conf %attr(755,root,root) %{_bindir}/* +%dir %{_libdir}/%{name} +%attr(755,root,root) %{_libdir}/%{name}/* %{_mandir}/man1/%{name}* %lang(pl) %{_mandir}/pl/man1/%{name}* +%files libs +%defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/lib*.so.* + +%files devel +%defattr(644,root,root,755) +%attr(755,root,root) %{_libdir}/lib*.so +%{_includedir}/* +%{_libdir}/lib*.la + +%files static +%defattr(644,root,root,755) +%{_libdir}/lib*.a + %define date %(echo `LC_ALL="C" date +"%a %b %d %Y"`) %changelog * %{date} PLD Team <[EMAIL PROTECTED]> All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.197.2.12 2005/07/26 16:10:09 arekm +- merge from DEVEL + Revision 1.197.2.11 2005/07/25 13:46:23 qboosh - sorted BRs @@ -418,6 +462,332 @@ Revision 1.134 2004/03/09 00:17:03 andree - add as bcond_with ignarch (add ignorearch option - patch3) + +Revision 1.133 2004/02/19 12:23:37 ankry +- reversed last change + +Revision 1.131 2004/02/19 11:26:02 qboosh +- fixed trigger, updated Ra release in it; release 7 + +Revision 1.130 2004/02/19 07:18:52 qboosh +- removed outdated patches, added cap_match_req-fix patch from author +- release 6 (5 reserved for Ra) + +Revision 1.129 2004/02/17 11:33:38 ankry +- contr-trigger for ra upgrade + +Revision 1.128 2004/02/17 08:39:07 ankry +- rel.4: 3 is in ra + +Revision 1.127 2004/01/15 12:16:43 jajcus +- Release: 2 +- update config.sub in trurlib + +Revision 1.126 2004/01/10 20:47:38 arekm +- correct tarball + +Revision 1.125 2004/01/10 20:11:02 arekm +- updated to 0.18.3 + +Revision 1.124 2004/01/09 19:00:42 arekm +- updated to current version from stable poldek branch + +Revision 1.123 2003/12/31 12:53:54 arekm +- added libselinux-devel to rpm-devel requires; removed from poldek br + +Revision 1.122 2003/12/31 12:07:53 troll +- BR: libselinux-devel + +Revision 1.121 2003/12/24 11:28:37 arekm +- allow proxy to cache data + +Revision 1.120 2003/12/09 23:39:09 yoshi +- BR fix: /usr/bin/pod2man -> perl-tools-pod + +Revision 1.119 2003/12/05 18:59:34 qboosh +- added unaligned patch to kill unaligned traps on alpha + (and fix 64-bit time_t handling on more archs) +- release 17 + +Revision 1.118 2003/11/28 22:39:54 qboosh +- force switch to db4.2 and rpm built with it, release 16 + +Revision 1.117 2003/11/27 16:15:48 qboosh +- fixed epoch0 patch, release 15 + +Revision 1.116 2003/11/26 16:40:56 adgor +- Added ldb4.patch +- Release 14 + +Revision 1.115 2003/11/24 00:09:59 qboosh +- removed R: pcre (autogenerated) + +Revision 1.114 2003/11/23 14:20:55 zytek +- R: pcre + +Revision 1.113 2003/11/23 01:34:25 qboosh +- added epoch0 patch (follow rpm 4.2.1+: no Epoch means Epoch 0) +- release 13 (only for rpm 4.2.1+!) + +Revision 1.112 2003/11/15 23:32:15 eothane +- bconds + +Revision 1.111 2003/10/20 11:40:29 qboosh +- removed R: pcre - it is autogenerated + +Revision 1.110 2003/10/17 23:58:01 havner +- R: openssl and R:pcre + +Revision 1.109 2003/09/30 20:18:30 eothane +- ahh, what the hell: openssl 0.9.7c + +Revision 1.108 2003/09/02 13:58:59 mmazur +- rel 12 for ac... let's play + +Revision 1.107 2003/08/18 21:38:54 arekm +- really apply patch5 (taken from poldek repo by ankry) and add another patch that fixes segfaults when rpmdb is a bit corrupted; rel 11 + +Revision 1.106 2003/07/16 12:24:41 ankry +- merge changes from cvs.pld.org.pl by mis and kloczek + +Revision 1.105 2003/07/15 07:24:40 qboosh +- BR: gettext-autopoint is back + +Revision 1.104 2003/06/30 08:05:20 serek +- more BR. + +Revision 1.103 2003/06/19 20:10:26 qboosh +- updated etc_dir patch: s/ETC_DIR/HOME_ETC/, dots are back +- cleanups + +Revision 1.102 2003/06/01 16:42:49 djrzulf +- md5 fixed, + +Revision 1.101 2003/05/25 11:00:57 malekith +- massive attack, adding Source-md5 + +Revision 1.100 2003/05/25 06:25:39 misi3k +- massive attack s/pld.org.pl/pld-linux.org/ + +Revision 1.99 2003/05/19 14:17:57 wiget +- rebuild + +Revision 1.98 2003/05/02 09:19:50 gotar +- added poldek-retr_term.patch, +- release 8. + +Revision 1.97 2003/04/30 13:15:25 mis +- rpm 4.1 bugfix (rpm4.1-fix.patch); rel 7 + +Revision 1.96 2003/04/15 17:04:40 mis +- updated rpm-4.2 patch; release 6 + +Revision 1.95 2003/04/07 12:27:42 juandon +- s/home_etc/etc_dir/ +- s/CONFIG_DIR/ETC_DIR/ + +Revision 1.94 2003/04/02 10:37:44 mis +- rpm 4.2 patch +- commented out home_etc patch (juandon: please test it yourself, + and if everything will works fine, uncomment) +- adapterized +- release 5 + +Revision 1.93 2003/03/27 22:29:28 malekith +- br ncurses-static if --with static + +Revision 1.92 2003/03/16 22:03:50 migo +- BR: gettext-autopoint + +Revision 1.91 2003/03/10 08:03:47 juandon +- added home_etc.patch +- Release 4.5 +- Please test and if everything works fine, set integer release + +Revision 1.90 2003/03/06 19:24:54 wiget +- added static.patch (fix --with static) +- remove gettext hack (not needed now) +- release 4 + +Revision 1.89 2003/02/19 12:24:12 malekith +- release 3; to rebuild on nest builders with new openssl + +Revision 1.88 2003/02/13 14:05:23 juandon +- force to use openssl >= 0.9.7, idea by kloczek + +Revision 1.87 2003/02/09 23:32:56 undefine +- poldek-static br readline-static + +Revision 1.86 2002/12/14 11:35:33 wrobell +- rel. 2 + +Revision 1.85 2002/12/11 00:18:56 wrobell +- rel. 1.1 to rebuild on nest/ppc + +Revision 1.84 2002/12/08 01:16:00 martii +- added BR automake and autoconf + +Revision 1.83 2002/11/27 19:46:36 mis +- updated to 0.18.1 + +Revision 1.82 2002/11/23 10:18:41 djrzulf +- STBR ! +- Release 7, +- s/securirity/security/ at poldek.conf + +Revision 1.81 2002/11/22 19:01:30 kloczek +- release 6: corrected ra-updates-* repositories paths. + +Revision 1.80 2002/11/21 21:48:03 kloczek +- release 5: changes in default poldek.conf file: +-- added commneted ra-updates-general packages repository, +-- added uncommented ra-updates-security packages repository. + +Revision 1.79 2002/11/14 19:26:27 mis +- yet another bugfix patch + +Revision 1.78 2002/11/14 16:52:52 mis +- corrected name of the patch + +Revision 1.77 2002/11/14 16:51:13 mis +- another bugfix patch; rel 4; stbr + +Revision 1.76 2002/11/12 20:23:56 jack +- Changed location of Ra+2.4.1{8,9} packs for i686. Now they are in the same place as i586 - I think macro in poldek.spec should replace i686 to proper %target_cpu, so please check it first +- bumped release. + +Revision 1.75 2002/11/12 12:34:55 mis +- +poldek-vfprogress.patch; release 2 + +Revision 1.74 2002/11/09 15:11:33 qboosh +- removed BR: db3-devel - db version is determined by rpm + +Revision 1.73 2002/11/08 21:52:57 kloczek +- s/db/db3/ in BuildRequires rules. + +Revision 1.72 2002/11/07 18:17:55 mis +- updated to 0.18 + +Revision 1.71 2002/10/28 16:12:52 zytek +- rel++, removed GNOME2-Pack from poldek.conf + +Revision 1.70 2002/10/20 18:23:03 mmazur +- from DEVEL + +Revision 1.69.2.3 2002/10/15 17:17:26 misiek +- new fixed from mis; rel 2 + +Revision 1.69.2.2 2002/10/15 08:13:54 wiget +- now compiles + +Revision 1.69.2.1 2002/10/14 12:25:45 misiek +- rpm4 snap + +Revision 1.69.2.39 2005/06/26 12:31:06 speedy +- BR: home-etc-devel + +Revision 1.69.2.38 2005/06/25 11:10:19 paszczus +- added snap version to previous commit + +Revision 1.69.2.37 2005/06/25 10:36:32 averne +- updated [20050613.22] + +Revision 1.69.2.36 2005/05/15 19:31:20 wolf +- 20050515.19 + +Revision 1.69.2.35 2005/05/05 21:40:33 wiget +- workaround for fopencookie() in glibc 2.3.5 +- release 0.snap.2 + +Revision 1.69.2.34 2005/04/27 21:52:17 wolf +- 20050426.21 + +Revision 1.69.2.33 2005/04/12 19:48:08 patrys +- up to 20050410.16 snapshot + +Revision 1.69.2.32 2005/02/20 02:08:44 gotar +- BR: libtool + +Revision 1.69.2.31 2004/12/16 10:30:51 pluto +- updated to 0.19.0-cvs20041215.21 (uninstall bug fixed). + +Revision 1.69.2.30 2004/12/15 10:40:10 pluto +- updated to 0.19.0-snap20041213.21. + +Revision 1.69.2.29 2004/12/14 15:14:22 pluto +- gcc4 fixes. + +Revision 1.69.2.28 2004/12/09 23:34:55 wolf +- capreq + +Revision 1.69.2.27 2004/10/17 07:46:29 gotar +- trigger has gone, so removed R: ed + +Revision 1.69.2.26 2004/10/11 20:36:58 wiget +- updated 0.19.0-cvs20041011.21 + +Revision 1.69.2.25 2004/10/09 10:57:36 wolf +- remove obsolete links + +Revision 1.69.2.24 2004/10/08 19:04:53 patrys +- updated for latest snapshot - 20041008.17 + +Revision 1.69.2.23 2004/10/06 15:36:34 patrys +- updated for most recent snapshot + +Revision 1.69.2.22 2004/10/06 10:02:02 wiget +- added apt mode "binaries" + +Revision 1.69.2.21 2004/10/06 09:38:36 wiget +- updated to 20041005.23 snapshot + +Revision 1.69.2.20 2004/10/03 16:29:34 wolf +- 20041003.16 + +Revision 1.69.2.19 2004/10/02 21:18:44 arekm +- updated + +Revision 1.69.2.18 2004/10/02 13:26:58 arekm +- snap update + +Revision 1.69.2.17 2004/10/02 10:01:43 arekm +- new snap + +Revision 1.69.2.16 2004/10/01 17:07:41 gotar +- fixed arch rewriting once more + +Revision 1.69.2.15 2004/10/01 13:00:04 arekm +- regenerated + +Revision 1.69.2.14 2004/09/30 19:28:13 arekm +- updated to 20040930 + +Revision 1.69.2.13 2004/09/29 14:29:38 wolf +- fix building on gcc 3.4.x + +Revision 1.69.2.12 2004/09/29 07:33:08 gotar +- fixed arch rewriting + +Revision 1.69.2.11 2004/09/28 21:31:12 arekm +- repackaged + +Revision 1.69.2.10 2004/09/28 18:37:16 arekm +- include all configs + +Revision 1.69.2.9 2004/09/28 17:57:08 arekm +- FIRST POLDEK2 SNAPSHOT + +Revision 1.69.2.8 2004/04/24 22:17:41 qboosh +- added types patch (fixes SEGV on 64-bit archs), release .2 + +Revision 1.69.2.7 2004/03/23 19:41:03 arekm +- updated to snapshot 20040323 (mis fixed 3 deps related bugs) + +Revision 1.69.2.6 2004/02/25 20:44:11 arekm +- capreq patch not needed (said mis) + +Revision 1.69.2.5 2004/02/24 23:29:12 arekm +20040224 snap Revision 1.133 2004/02/19 12:23:37 ankry - reversed last change ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/poldek.spec?r1=1.197.2.11&r2=1.197.2.12&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
