diff --git a/.cvsignore b/.cvsignore index 9b383a6..33daab1 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -mash-0.2.8.tar.gz +mash-0.5.8.tar.gz diff --git a/mash.spec b/mash.spec index 77ea809..0aa6b54 100644 --- a/mash.spec +++ b/mash.spec @@ -1,16 +1,13 @@ %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")} Name: mash -Version: 0.2.10 -Release: 4%{?dist} +Version: 0.5.8 +Release: 1%{?dist} Summary: Koji buildsystem to yum repository converter Group: Development/Tools License: GPL URL: http://people.redhat.com/notting/mash/ Source0: http://people.redhat.com/notting/mash/%{name}-%{version}.tar.gz -Patch1: mash-noarch_build_nosrc-fix.patch -Patch2: mash-multilib_yum_reponame-fix.patch -Patch3: mash-multilib-sync.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires: yum, createrepo, koji Conflicts: pungi < 1.0.0 @@ -24,9 +21,6 @@ any multlib RPMs that are necessary. %prep %setup -q -%patch1 -p0 -%patch2 -p0 -%patch3 -p0 -b .foo %build %{__python} setup.py build @@ -36,32 +30,119 @@ rm -rf $RPM_BUILD_ROOT %{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT mv $RPM_BUILD_ROOT/%{_bindir}/mash.py $RPM_BUILD_ROOT/%{_bindir}/mash - +mkdir -p $RPM_BUILD_ROOT/var/cache/mash %clean rm -rf $RPM_BUILD_ROOT - %files %defattr(-,root,root,-) %doc AUTHORS ChangeLog COPYING README TODO %config(noreplace) %{_sysconfdir}/mash -%{python_sitelib}/mash +%{python_sitelib}/mash* %{_bindir}/* %{_datadir}/mash +/var/cache/mash %changelog -* Mon Jun 23 2008 Bill Nottingham 0.2.10-4 -- fix scim-qt* +* Mon Jun 29 2009 Bill Nottingham 0.5.8-1 +- noarch packages can have debuginfo too (#508746) +- remove wine-arts from multilib whitelist (not needed, doesn't exist) + +* Tue Jun 23 2009 Bill Nottingham 0.5.7-1 +- when using previous runs for deltas, only look in the appropriate arch dirs +- wine multilib fixes + +* Mon Jun 22 2009 Bill Nottingham 0.5.6-1 +- more gtk2 multilib (#507165) +- minor transaction speedups +- handle new yum arch-setting API. () + +* Fri May 8 2009 Bill Nottingham 0.5.5-1 +- fix setting delta_dirs in config file +- canonicalize -o option if passed as a relative path + +* Wed May 6 2009 Bill Nottingham 0.5.4-1 +- allow configuring createrepo hash type +- remove old config files + +* Mon Apr 27 2009 Bill Nottingham 0.5.3-1 +- when copying in old deltas, make sure the signatures match current packages +- don't delta source and debuginfo packages + +* Fri Apr 17 2009 Bill Nottingham 0.5.2-1 +- set a max size for deltarpm-able packages (#496242) + +* Thu Apr 16 2009 Bill Nottingham 0.5.1-1 +- delta fixes +- handle qt/kde plugins better (#495947) + +* Wed Apr 15 2009 Bill Nottingham 0.5.0-1 +- Add support for generating deltas with createrepo +- add F11 key to config () +- various multlib updates (#485242, etc.) + +* Thu Jan 8 2009 Bill Nottingham 0.4.9-1 +- error out if strict_keys is set and we can't download the signed package + +* Thu Dec 18 2008 Bill Nottingham 0.4.8-1 +- Fix debuginfo exclusion +- Fix --skip-stat with old createrepo +- Use update_from, if it's available + +* Wed Dec 17 2008 Bill Nottingham 0.4.7-1 +- Fix noarch handling + +* Wed Dec 17 2008 Bill Nottingham 0.4.6-1 +- Fix -p/--previous for certain repository layouts + +* Tue Dec 16 2008 Bill Nottingham 0.4.5-1 +- fix caching bug with respect to epochs +- work with both python createrepo API and commandline createrepo + +* Tue Dec 16 2008 Bill Nottingham 0.4.4-1 +- Mark gstreamer plugins as multilib (#252173) +- Some more multilib devel blacklisting, including php. (#342851) +- Add a --previous option, for copying createrepo data + +* Wed Oct 15 2008 Bill Nottingham 0.4.2-1 +- Enable unique repoadata file names () +- Add a kernel multilib policy for sparc () +- Fix base multilib policy, and packages with no key () + +* Mon Sep 15 2008 Bill Nottingham 0.4.1-1 +- Adjust for new keys + +* Tue Jul 22 2008 Bill Nottingham 0.4.0-1 +- add simple timestamping for profiling usage +- add support for caching non-local koji repositories + +* Fri May 16 2008 Bill Nottingham 0.3.7-1 +- add F9 updates configuration + +* Tue Apr 29 2008 Bill Nottingham 0.3.6-1 +- adjust qt path to catch scim-bridge-qt + +* Mon Apr 14 2008 Bill Nottingham 0.3.5-1 +- add pulseaudio-utils as well -* Mon Apr 14 2008 Bill Nottingham 0.2.10-3 -- sync again +* Fri Apr 11 2008 Bill Nottingham 0.3.4-1 +- add alsa plugins to multilib list (#338211) -* Fri Apr 11 2008 Bill Nottingham 0.2.10-2 -- sync multilib list with HEAD +* Tue Apr 1 2008 Bill Nottingham 0.3.3-1 +- add gtk modules to multilib list (#439949) -* Wed Feb 20 2008 Bill Nottingham +* Fri Feb 22 2008 Bill Nottingham 0.3.2-1 +- fix typo that broke handling of unsigned packages +- fix yum api usage (#433555, ) - fix noarch w/o src.rpm logic (#433551, ) -- fix yum API usage (#433555, ) +- Add a 'use_repoview' option that allows us to toggle repoview generation. () +- Tell createrepo to be quiet () +- Don't re-generate repoview after multilib solving. () +- Fix our "failsafe" shutil.copyfile call () + +* Thu Jan 17 2008 Bill Nottingham 0.3.0-1 +- use createrepo's python API +- allow running without local koji storage * Mon Nov 19 2007 Bill Nottingham 0.2.10-1 - handle non Packages/ repositories better (#350391) diff --git a/sources b/sources index b72ff36..f5057bd 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -0c2bfe44263977937ec2f88c3d0cb97c mash-0.2.10.tar.gz +bf01baab29a01b70028bd2668d4455ea mash-0.5.8.tar.gz