rpms/calendar/devel calendar.spec,1.2,1.3

David Cantrell dcantrel at fedoraproject.org
Wed Mar 4 05:19:50 UTC 2009


Author: dcantrel

Update of /cvs/pkgs/rpms/calendar/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27682

Modified Files:
	calendar.spec 
Log Message:
* Tue Mar 03 2009 David Cantrell <dcantrell at redhat.com> - 1.25-5
- Convert output to locale's character coding



Index: calendar.spec
===================================================================
RCS file: /cvs/pkgs/rpms/calendar/devel/calendar.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- calendar.spec	24 Feb 2009 06:31:51 -0000	1.2
+++ calendar.spec	4 Mar 2009 05:19:18 -0000	1.3
@@ -1,7 +1,7 @@
 Summary: Reminder utility
 Name:    calendar
 Version: 1.25
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: BSD
 Group:   Applications/Productivity
 URL:     http://www.openbsd.org/cgi-bin/cvsweb/src/usr.bin/calendar
@@ -16,6 +16,7 @@
 Source2: export-calendar-source.sh
 
 Patch0:  %{name}-1.25-linux.patch
+Patch1:  %{name}-1.25-coding.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -29,8 +30,17 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 %{__cp} %{SOURCE1} Makefile
 
+for c in calendars/*.*/* ; do
+    fromcode="$(%{__grep} '^LANG=' "$c" | %{__sed} 's/^LANG=\(.*\)\.\(.*\)\(@.*\)\{0,1\}/\2/')"
+    if [ ! -z "$fromcode" ]; then
+        iconv -f "$fromcode" -t "UTF-8" "$c" > "$c.conv"
+        %{__mv} "$c.conv" "$c"
+    fi
+done
+
 %build
 %{__make} %{?_smp_mflags}
 
@@ -48,6 +58,9 @@
 %{_datadir}/calendar
 
 %changelog
+* Tue Mar 03 2009 David Cantrell <dcantrell at redhat.com> - 1.25-5
+- Convert output to locale's character coding
+
 * Mon Feb 23 2009 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.25-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 




More information about the fedora-extras-commits mailing list