[dwm/f14: 3/3] Post-merge cleanup

Petr Sabata psabata at fedoraproject.org
Mon Jun 27 13:49:08 UTC 2011


commit fca5477fb922b410c91d312c7c4d0e64fce7d0e9
Merge: 5afd285 8db55ae
Author: Petr Sabata <contyk at redhat.com>
Date:   Mon Jun 27 15:48:45 2011 +0200

    Post-merge cleanup

 dwm-5.8.2-config.patch |   22 ++++++++++++++++++++++
 dwm-5.8.2-prefix.patch |   11 -----------
 dwm.spec               |   32 ++++++++++++++++++++------------
 fedora-config.patch    |    2 +-
 4 files changed, 43 insertions(+), 24 deletions(-)
---
diff --cc dwm.spec
index 6ca1bcc,696184e..62e2740
--- a/dwm.spec
+++ b/dwm.spec
@@@ -88,6 -86,19 +86,16 @@@ install -m644 %{SOURCE4} %{buildroot}%{
  %{_dwmsourcedir}
  
  %changelog
 -* Mon Jun 27 2011 Petr Sabata <contyk at redhat.com> - 5.8.2-9
++* Mon Jun 27 2011 Petr Sabata <contyk at redhat.com> - 5.8.2-8
+ - Remove now obsolete defattr
+ - Move dwm-start(.1) substitutions to install section since we don't want to
+   modify sources in place
+ - Change the prefix patch to generic config patch; we now respect Fedora
+   RPM_OPT_FLAGS
+ 
 -* Mon Apr 04 2011 Petr Sabata <psabata at redhat.com> - 5.8.2-8
++* Mon Apr 04 2011 Petr Sabata <psabata at redhat.com> - 5.8.2-7
+ - Switch to Terminus (upstream default, anyway)
+ 
 -* Wed Feb 09 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 5.8.2-7
 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
 -
  * Fri Nov 26 2010 Petr Sabata <psabata at redhat.com> - 5.8.2-6
  - dwm-start now supports user patches via ~/.dwm/patches directory
  - dwm-start now supports -f option


More information about the scm-commits mailing list