rpms/drpython/F-7 .cvsignore, 1.2, 1.3 drpython.spec, 1.3, 1.4 sources, 1.2, 1.3 drpython-setup.py.postinst.patch, 1.1, NONE drpython-wxversion.patch, 1.1, NONE

[Marc Wiriadisastra (mwiriadi)]

Author: mwiriadi

Update of /cvs/pkgs/rpms/drpython/F-7
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31517/F-7

Modified Files:
	.cvsignore drpython.spec sources 
Removed Files:
	drpython-setup.py.postinst.patch drpython-wxversion.patch 
Log Message:
New release and added an Epoch




Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/drpython/F-7/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore	5 Jan 2008 22:50:25 -0000	1.2
+++ .cvsignore	24 Mar 2008 14:34:21 -0000	1.3
@@ -1 +1 @@
-drpython165.zip
+drpython-3.11.0.zip


Index: drpython.spec
===================================================================
RCS file: /cvs/pkgs/rpms/drpython/F-7/drpython.spec,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- drpython.spec	17 Jan 2008 11:43:49 -0000	1.3
+++ drpython.spec	24 Mar 2008 14:34:21 -0000	1.4
@@ -1,17 +1,16 @@
 %{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 Name:           drpython
-Version:        165
-Release:        3%{?dist}.1
+Version:        3.11.0
+Release:        2%{?dist}
+Epoch:          1
 Summary:        A simple Python IDE designed with teaching in mind
 
 Group:          Development/Tools
 License:        GPLv2+
 URL:            http://drpython.sourceforge.net/
-Source0:        http://downloads.sourceforge.net/%{name}/%{name}%{version}.zip
+Source0:        http://downloads.sourceforge.net/%{name}/%{name}-%{version}.zip
 Source1:        %{name}.desktop
 Source2:        drpython.sh
-Patch0:         drpython-setup.py.postinst.patch 
-Patch1:         drpython-wxversion.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  python-devel, wxPython-devel, desktop-file-utils, python-setuptools-devel
@@ -26,8 +25,6 @@
 
 %prep
 %setup -q -n %{name}
-%patch0 -p1
-%patch1 -p1
 
 # Change Windows line endings to Unix line endings
 for file in $(find *.txt *.TXT -type f); do
@@ -36,9 +33,9 @@
 
 # Remove Windows related files and patch the setup.py file so it doesn't rely on the file
 rm -rf tools/
-rm -f postinst.py
 rm -f setup.cfg
 
+
 %build
 %{__python} setup.py build
 
@@ -60,6 +57,13 @@
      --dir=${RPM_BUILD_ROOT}%{_datadir}/applications \
      %{SOURCE1}
 
+iconv -f ISO_8859-1 -t utf8 Changelog.txt --output Changelog.utf8
+touch -r Changelog.txt Changelog.utf8
+mv Changelog.utf8 Changelog.txt
+
+iconv -f ISO_8859-1 -t utf8 History.txt --output History.utf8
+touch -r History.txt History.utf8
+mv History.utf8 History.txt
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -72,8 +76,16 @@
 %{_datadir}/applications/fedora-drpython.desktop
 %{_datadir}/pixmaps/drpython.png
 %{_bindir}/drpython
+%exclude %{python_sitelib}/%{name}/postinst.py
 
 %changelog
+* Mon Mar 24 2008 Marc Wiriadisastra <marc at mwiriadi.id.au> 1:3.11.0-2
+- Added epoch 1 as requested
+
+* Mon Mar 24 2008 Marc Wiriadisastra <marc at mwiriadi.id.au> 3.11.0-1
+- new release
+- new numbering system
+
 * Thu Jan 17 2008 Marc Wiriadisastra <marc at mwiriadi.id.au> 165-3.1
 - Added patch for wxversion in F-7
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/drpython/F-7/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources	5 Jan 2008 22:50:25 -0000	1.2
+++ sources	24 Mar 2008 14:34:21 -0000	1.3
@@ -1 +1 @@
-02bb6a4d771addef978c9005007e6ed9  drpython165.zip
+af7e18ebfd7788c6ccbb9758c983f0d5  drpython-3.11.0.zip


--- drpython-setup.py.postinst.patch DELETED ---


--- drpython-wxversion.patch DELETED ---