[pmount: 2/2] Fix spec conflicts.

[Richard Shaw]

commit 11e014e0c29a636b237a5eb769282fcfb3035457
Merge: 42a5c1a fe49681
Author: Richard M. Shaw <hobbes1069 at gmail.com>
Date:   Tue May 21 09:26:45 2013 -0500

    Fix spec conflicts.

 pmount.spec |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)
---
diff --cc pmount.spec
index e19151d,05a3be7..5ba4fd7
--- a/pmount.spec
+++ b/pmount.spec
@@@ -1,9 -1,7 +1,9 @@@
 +%global _hardened_build 1
  %define download_dir 3310
 +
  Name:           pmount
  Version:        0.9.23
- Release:        2%{?dist}
 -Release:        3%{?dist}
++Release:        4%{?dist}
  Summary:        Enable normal user mount
  
  Group:          System Environment/Base
@@@ -62,10 -60,12 +62,16 @@@ make install DESTDIR=%{buildroot
  
  
  %changelog
 +* Tue May 21 2013 Richard Shaw <hobbes1069 at gmail.com> - 0.9.23-2
 +- Fix cflags to meet packaging guidelines for packages that contain suid
 +  binaries. Fixes BZ# 965459.
 +
+ * Thu Feb 14 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.23-3
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+ 
+ * Sat Jul 21 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 0.9.23-2
+ - Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
+ 
  * Tue Jul 10 2012 Richard Shaw <hobbes1069 at gmail.com> - 0.9.23-1
  - Update to latest upstream release.