Browse Source

2015-01-26 Ryoichi INAGAKI <ryo1@toki.waseda.jp>

	* ocaml-camlp5, ocaml-labltk: fixed spec
	


git-svn-id: http://trac.vinelinux.org/repos/projects/specs@9297 ec354946-7b23-47d6-9f5a-488ba84defc7
inagaki 9 years ago
parent
commit
435ab45ceb
2 changed files with 11 additions and 3 deletions
  1. 6 1
      o/ocaml-camlp5/ocaml-camlp5-vl.spec
  2. 5 2
      o/ocaml-labltk/ocaml-labltk-vl.spec

+ 6 - 1
o/ocaml-camlp5/ocaml-camlp5-vl.spec

@@ -7,7 +7,7 @@ Name:           ocaml-camlp5
 Summary:        Classical version of camlp4 OCaml preprocessor
 Summary(ja):    Camlp4 OCaml プリプロセッサの古典的な実装 
 Version:        6.12
-Release:        1%{?_dist_release}
+Release:        2%{?_dist_release}
 
 License:        BSD
 Group:          Development/Languages
@@ -19,6 +19,8 @@ Patch0:         camlp5-6.11-kill-warn-error.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 BuildRequires:  ocaml
+Obsoletes:      camlp5 < %{version}-%{release}
+Provides:       camlp5 = %{version}-%{release}
 
 Vendor:         Project Vine
 Distribution:   Vine Linux
@@ -118,6 +120,9 @@ if [ -d $RPM_BUILD_ROOT ]; then %{__rm} -rf $RPM_BUILD_ROOT; fi
 %{_mandir}/man1/*
 
 %changelog
+* Mon Jan 26 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> - 6.12-2
+- added Obsoletes and Provides tag
+
 * Mon Jan 26 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> - 6.12-1
 - changed package name
 - updated to 6.12

+ 5 - 2
o/ocaml-labltk/ocaml-labltk-vl.spec

@@ -6,12 +6,12 @@
 
 Name:          ocaml-labltk
 Version:       8.06.0
-Release:       1%{?_dist_release}
+Release:       2%{?_dist_release}
 Summary:       Tcl/Tk interface for OCaml
 Summary(ja):   OCaml の Tk インターフェース
 
 License:       LGPLv2+ with exceptions
-Group:	       Development/Languages
+Group:	       System Environment/Libraries
 URL:           https://forge.ocamlcore.org/projects/labltk/
 
 Source0:       https://forge.ocamlcore.org/frs/download.php/1455/labltk-%{version}.tar.gz
@@ -100,6 +100,9 @@ install -m 0644 camltk/*.o $RPM_BUILD_ROOT%{_libdir}/ocaml/labltk
 
 
 %changelog
+* Mon Jan 26 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> - 8.06.0-2
+- moved to System Environment/Libraries Group
+
 * Mon Jan 26 2015 Ryoichi INAGAKI <ryo1@toki.waseda.jp> - 8.06.0-1
 - Initial build for Vine Linux (splitted from ocaml package)