SPECS: ORBit2.spec - 2.12.5, killed bogus automake subpackage

freetz freetz at pld-linux.org
Wed Feb 8 16:48:18 CET 2006


Author: freetz                       Date: Wed Feb  8 15:48:18 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- 2.12.5, killed bogus automake subpackage

---- Files affected:
SPECS:
   ORBit2.spec (1.87 -> 1.88) 

---- Diffs:

================================================================
Index: SPECS/ORBit2.spec
diff -u SPECS/ORBit2.spec:1.87 SPECS/ORBit2.spec:1.88
--- SPECS/ORBit2.spec:1.87	Wed Feb  1 18:30:16 2006
+++ SPECS/ORBit2.spec	Wed Feb  8 16:48:13 2006
@@ -3,13 +3,13 @@
 Summary(fr):	Requčte d'Objects CORBA
 Summary(pl):	Wysoko wydajny CORBA Object Request Broker
 Name:		ORBit2
-Version:	2.12.4
-Release:	2
+Version:	2.12.5
+Release:	1
 Epoch:		1
 License:	GPL v2+/LGPL v2+
 Group:		Libraries
 Source0:	http://ftp.gnome.org/pub/gnome/sources/ORBit2/2.12/%{name}-%{version}.tar.bz2
-# Source0-md5:	aa2cae6e7957c369edccbd98ba78dea9
+# Source0-md5:	cc52f71d974043414afea44c78e6d705
 Patch0:		%{name}-pthread.patch
 Patch1:		%{name}-popt.patch
 URL:		http://www.labs.redhat.com/orbit/
@@ -30,6 +30,7 @@
 Provides:	linc = 1.1.1
 Obsoletes:	libORBit2_0
 Obsoletes:	linc
+Obsoletes:	ORBit2-automake
 Conflicts:	libbonobo < 2.3.2
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
@@ -60,7 +61,6 @@
 Requires:	%{name} = %{epoch}:%{version}-%{release}
 Requires:	glib2-devel >= 1:2.6.3
 Requires:	indent
-Requires:	%{name}-automake = %{epoch}:%{version}-%{release}
 Requires:	libIDL-devel >= 0.8.5
 Provides:	linc-devel = 1.1.1
 Obsoletes:	libORBit2_0-devel
@@ -110,19 +110,6 @@
 Ten pakiet zawiera biblioteki statyczne potrzebne do pisania programów
 skonsolidowanych statycznie używających technologii CORBA.
 
-%package automake
-Summary:        Automake macros for ORBit2
-Summary(pl):    Makra dla automake do ORBit2
-Group:          Development/Tools
-Requires:       automake
-Conflicts:      ORBit2-devel < 1:2.12.4-2
-
-%description automake
-Automake macros for ORBit2.
-
-%description automake -l pl
-Makra dla automake do ORBit2.
-
 %prep
 %setup -q
 %patch0 -p1
@@ -135,7 +122,6 @@
 %{__autoconf}
 %{__autoheader}
 %{__automake}
-
 %configure \
 	--with-html-dir=%{_gtkdocdir} \
 	--enable-gtk-doc \
@@ -176,8 +162,9 @@
 %attr(755,root,root) %{_libdir}/lib*.so
 %{_libdir}/lib*.la
 %{_libdir}/libname-server-2.a
-%{_pkgconfigdir}/*.pc
+%{_aclocaldir}/* 
 %{_includedir}/orbit-*
+%{_pkgconfigdir}/*.pc
 %{_gtkdocdir}/%{name}
 
 %files static
@@ -186,17 +173,15 @@
 %{_libdir}/libORBit-imodule-2.a
 %{_libdir}/libORBitCosNaming-2.a
 
-%files automake
-%defattr(644,root,root,755)
-%{_aclocaldir}/*
-
-
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
 * %{date} PLD Team <feedback at pld-linux.org>
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.88  2006/02/08 15:48:13  freetz
+- 2.12.5, killed bogus automake subpackage
+
 Revision 1.87  2006/02/01 17:30:16  djurban
 - add automake br in devel, remove without apidocs backend as i'd have to break half
   of the configure.ac.
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/ORBit2.spec?r1=1.87&r2=1.88&f=u



More information about the pld-cvs-commit mailing list