rpms/flasm/EL-5 .cvsignore, 1.2, 1.3 flasm.spec, 1.3, 1.4 sources, 1.2, 1.3

[Patrice Dumas (pertusus)]

Author: pertusus

Update of /cvs/extras/rpms/flasm/EL-5
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18568/EL-5

Modified Files:
	.cvsignore flasm.spec sources 
Log Message:
sync with devel


Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/flasm/EL-5/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	3 Jul 2006 21:02:22 -0000	1.2
+++ .cvsignore	26 Dec 2007 00:46:16 -0000	1.3
@@ -1,2 +1,2 @@
+flasm162src.zip
 flasm.1.gz
-flasm16src.zip


Index: flasm.spec
===================================================================
RCS file: /cvs/extras/rpms/flasm/EL-5/flasm.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- flasm.spec	10 Sep 2006 22:35:42 -0000	1.3
+++ flasm.spec	26 Dec 2007 00:46:16 -0000	1.4
@@ -1,12 +1,14 @@
 Name:           flasm
-Version:        1.61
+Version:        1.62
 Release:        3%{?dist}
 Summary:        Flash bytecode assembler disassembler
 
 Group:          Development/Tools
-License:        BSD-like
+License:        BSD
 URL:            http://flasm.sourceforge.net/
-Source0:        http://www.nowrap.de/download/flasm16src.zip
+# get here, but source name hasn't changed while the tarball has changed
+#Source0:        http://www.nowrap.de/download/flasm16src.zip
+Source0:        flasm162src.zip
 Source1:        http://shield.jp/~dseg/rpms/flasm/flasm.1.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -22,10 +24,21 @@
 %prep
 %setup -q -c
 # cleanup perms and end of lines
-chmod -x *.TXT assembler.flex assembler.y *.c *.h *.ini Makefile keywords.gperf
-sed -i 's/\r//' *.TXT flasm.html classic.css flasm.ini
+chmod -x *.TXT assembler.flex assembler.y *.c *.h *.ini Makefile \
+ keywords.gperf logo.gif classic.css flasm.html
+
+# Remove dos end of lines and convert to utf8
+for file in *.TXT flasm.ini classic.css flasm.html; do
+  sed 's/\r//' $file > $file.new
+  touch -r $file $file.new
+  mv $file.new $file
+done
+iconv -f ISO_8859-1 -t UTF-8 < CHANGES.TXT > CHANGES.TXT.utf8
+touch -r CHANGES.TXT CHANGES.TXT.utf8
+mv CHANGES.TXT.utf8 CHANGES.TXT
+
 # man page associated with another flasm rpm
-cp %{SOURCE1} .
+cp -p %{SOURCE1} .
 gunzip flasm.1.gz
 
 
@@ -39,7 +52,7 @@
 install -d -m755 $RPM_BUILD_ROOT%{_bindir}/
 install -d -m755 $RPM_BUILD_ROOT%{_mandir}/man1/
 install flasm $RPM_BUILD_ROOT%{_bindir}/
-install -m644 flasm.1 $RPM_BUILD_ROOT%{_mandir}/man1/
+install -m644 -p flasm.1 $RPM_BUILD_ROOT%{_mandir}/man1/
 
 
 %clean
@@ -48,13 +61,19 @@
 
 %files
 %defattr(-,root,root,-)
-%doc LICENSE.TXT CHANGES.TXT classic.css logo.gif flasm.html logo.gif 
+%doc LICENSE.TXT CHANGES.TXT classic.css logo.gif flasm.html
 %doc flasm.ini
 %{_bindir}/flasm
 %{_mandir}/man1/flasm.1*
 
 
 %changelog
+* Tue Dec 25 2007 Patrice Dumas <pertusus at free.fr> 1.62-3
+- minor cleanups
+
+* Wed Aug  8 2007 Patrice Dumas <pertusus at free.fr> 1.62-2
+- update to 1.62
+
 * Sun Sep 10 2006 Patrice Dumas <pertusus at free.fr> 1.61-3
 - rebuild for FC-6
 


Index: sources
===================================================================
RCS file: /cvs/extras/rpms/flasm/EL-5/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	3 Jul 2006 21:02:22 -0000	1.2
+++ sources	26 Dec 2007 00:46:16 -0000	1.3
@@ -1,2 +1,2 @@
+ce0edf6b424c70fadc7ea2277d312a70  flasm162src.zip
 8e1df0e00a2ed2866fe009e081c26333  flasm.1.gz
-4765619d15d8145de39d53da8bc0f2df  flasm16src.zip