Переглянути джерело

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@1287 ec354946-7b23-47d6-9f5a-488ba84defc7

kudoh 15 роки тому
батько
коміт
17cc85df56
2 змінених файлів з 38 додано та 38 видалено
  1. 10 5
      k/keepnote/keepnote-vl.spec
  2. 28 33
      p/python-crypto/python-crypto-vl.spec

+ 10 - 5
k/keepnote/keepnote-vl.spec

@@ -1,13 +1,13 @@
 Summary:        A note taking application
 Summary(ja):    ノート作成アプリケーション
 Name:           keepnote
-Version:        0.6.2
-Release:        2%{?_dist_release}
+Version:        0.6.3
+Release:        1%{?_dist_release}
 Group:          Applications/Editors
 License:        GPLv2+
 URL:            http://rasm.ods.org/keepnote/
 Source0:        %{name}/%{name}-%{version}.tar.gz
-Source1:        ja_JP.UTF8.po
+#Source1:        ja_JP.UTF8.po
 
 Patch1:         Makefile_gettetxt.patch
 
@@ -42,8 +42,8 @@ KeepNote では、あなたの分類ノート、TODO リスト、研究ノート
 %setup -q
 #%patch1 -p1
 
-%{__cp} -f %{SOURCE1} gettext/ja_JP.UTF8.po
-make -f Makefile.gettext make LANG=ja_JP.UTF8
+#%{__cp} -f %{SOURCE1} gettext/ja_JP.UTF8.po
+#make -f Makefile.gettext make LANG=ja_JP.UTF8
 
 %build
 python setup.py build
@@ -81,6 +81,11 @@ update-desktop-database > /dev/null 2>&1 || :
 
 
 %changelog
+* Wed Jul 7 2010 Toshiharu Kudoh <toshi.kd2@gmail.com> - 0.6.3-1
+- new upstream release
+- dropt source1
+  - merged upstream
+
 * Thu May 6 2010 Toshiharu Kudoh <toshi.kd2@gmail.com> - 0.6.2-2
 - updated Source1
 - fixed desktop-file-install --add-category section

+ 28 - 33
p/python-crypto/python-crypto-vl.spec

@@ -4,16 +4,17 @@
 Summary:	Cryptography library for Python
 Summary(ja):	Python 用 Cryptography ライブラリ
 Name:		python-crypto
-Version:	2.0.1
-Release:	3%{?_dist_release}
+Version:	2.1.0
+Release:	1%{?_dist_release}
 License:	Python License (CNRI Python License)
 Group:		Development/Libraries
-URL:		http://www.amk.ca/python/code/crypto.html
-Source:		http://www.amk.ca/files/python/crypto/pycrypto-2.0.1.tar.gz
+URL:		http://www.dlitz.net/software/pycrypto/
+Source:		http://ftp.dlitz.net/pub/dlitz/crypto/pycrypto/pycrypto-%{version}.tar.gz
 
-Patch0:         arc2-buffer-overflow.patch
+#Patch0:         arc2-buffer-overflow.patch
 Patch1:         no-usr-local.patch
-Patch2:         run-tests.patch
+#Patch2:         run-tests.patch
+Patch3:         doc.patch
 
 BuildRequires:	python >= 2.2
 BuildRequires:	python-devel >= 2.2
@@ -27,23 +28,24 @@ Python-crypto is a collection of both secure hash functions
 
 %prep
 %setup -n pycrypto-%{version} -q
-%patch0 -p1
+#%patch0 -p1
 %patch1 -p1
-%patch2 -p1
-
-
-sed -i s:/lib:/%_lib:g setup.py
+#%patch2 -p1
+%patch3 -p1
 
+# Remove spurious shellbangs
+%{__sed} -i -e '\|^#!/usr/local/bin/python| d' lib/Crypto/Util/RFC1751.py
 
 %build
 CFLAGS="$RPM_OPT_FLAGS" %{__python} setup.py build
 
-
 %install
-rm -rf $RPM_BUILD_ROOT
-%{__python} setup.py install -O1 --skip-build --root $RPM_BUILD_ROOT
-find -name "*.py"|xargs %{__perl} -pi -e "s:/usr/local/bin/python:%{__python}:"
+%{__rm} -rf %{buildroot}
+%{__python} setup.py install -O1 --skip-build --root %{buildroot}
 
+# Remove group write permissions on shared objects
+/usr/bin/find %{buildroot}%{python_sitearch} -name '*.so' \
+	-exec %{__chmod} g-w {} \;
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -51,26 +53,19 @@ rm -rf $RPM_BUILD_ROOT
 
 %files
 %defattr(-,root,root,-)
-%doc README TODO ACKS ChangeLog LICENSE Doc
-
-%{python_sitearch}/Crypto/*.py*
-%{python_sitearch}/Crypto/Cipher/*.so
-%{python_sitearch}/Crypto/Cipher/*.py*
-%{python_sitearch}/Crypto/Hash/*.so
-%{python_sitearch}/Crypto/Hash/*.py*
-%{python_sitearch}/Crypto/Protocol/*.py*
-%{python_sitearch}/Crypto/PublicKey/*.so
-%{python_sitearch}/Crypto/PublicKey/*.py*
-%{python_sitearch}/Crypto/Util/*.py*
-%{python_sitearch}/*.egg-info
-
-%dir %{python_sitearch}/Crypto/Cipher/
-%dir %{python_sitearch}/Crypto/Hash/
-%dir %{python_sitearch}/Crypto/Protocol/
-%dir %{python_sitearch}/Crypto/PublicKey/
-%dir %{python_sitearch}/Crypto/Util/
+%doc README TODO ACKS ChangeLog LEGAL/ COPYRIGHT Doc/
+%{python_sitearch}/pycrypto-2.1.0-py2.6.egg-info
+%{python_sitearch}/Crypto/
 
 %changelog
+* Wed Jul 7 2010 Toshiharu Kudoh <toshi.kd2@gmail.com> 2.1.0-1
+- new upstream release
+- changed URL and SOURCE to new upstream
+- dropt patch0,2
+- replaced patch1 from Debian newer
+- added pacth3 from Debian
+- changed document files dir in %%files
+
 * Tue Feb 02 2010 Shu KONNO <owa@bg.wakwak.com> 2.0.1-3
 - rebuild with python-2.6