[poedit] Don't ship docs twice (#827472)

Christoph Wickert cwickert at fedoraproject.org
Fri Jun 1 15:36:50 UTC 2012


commit 745d2926b9ad272a8bd1b05555c29cf5248e8fb1
Author: Christoph Wickert <cwickert at fedoraproject.org>
Date:   Fri Jun 1 17:36:46 2012 +0200

    Don't ship docs twice (#827472)

 poedit.spec |   21 +++++++++++++--------
 1 files changed, 13 insertions(+), 8 deletions(-)
---
diff --git a/poedit.spec b/poedit.spec
index 2ad7880..36e0c03 100644
--- a/poedit.spec
+++ b/poedit.spec
@@ -1,6 +1,6 @@
 Name:           poedit
 Version:        1.4.6.1
-Release:        5%{?dist}
+Release:        6%{?dist}
 Summary:        GUI editor for GNU gettext .po files
 
 Group:          Development/Tools
@@ -25,6 +25,12 @@ another language.
 
 %prep
 %setup -q
+# Make sure docs are utf-8
+for FILE in `find docs/en -name '*.hhp'`; do
+    iconv -f iso-8859-15 -t utf-8 $FILE > $FILE.tmp && \
+    touch -r $FILE $FILE.tmp && \
+    mv -f $FILE.tmp $FILE
+done
 
 
 %build
@@ -35,6 +41,7 @@ make %{?_smp_mflags}
 %install
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT
+
 # Remove a few unnecessary locations where the makefile may install
 # copies of icons and .desktop files
 rm -rf \
@@ -42,12 +49,7 @@ rm -rf \
     $RPM_BUILD_ROOT%{_datadir}/mimelnk \
     $RPM_BUILD_ROOT%{_datadir}/gnome \
     $RPM_BUILD_ROOT%{_datadir}/mime-info
-# Make sure docs are utf-8
-for FILE in `find docs/en -name '*.hhp'`; do
-    iconv -f iso-8859-15 -t utf-8 $FILE > $FILE.tmp && \
-    touch -r $FILE $FILE.tmp && \
-    mv -f $FILE.tmp $FILE
-done
+
 # Install the desktop file
 desktop-file-install \
     --delete-original \
@@ -81,7 +83,7 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 %files -f poedit.lang
 %defattr(-,root,root,-)
-%doc NEWS TODO README COPYING AUTHORS docs/*.txt docs/en
+%doc NEWS TODO README COPYING AUTHORS docs/*.txt
 %{_bindir}/*
 %{_datadir}/applications/*.desktop
 %{_datadir}/icons/hicolor/*/*
@@ -91,6 +93,9 @@ gtk-update-icon-cache %{_datadir}/icons/hicolor &>/dev/null || :
 
 
 %changelog
+* Fri Jun 01 2012 Christoph Wickert <cwickert at fedoraproject.org> - 1.4.6.1-6
+- Don't ship docs twice (#827472)
+
 * Sat Jan 14 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.4.6.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 


More information about the scm-commits mailing list