SPECS: opal.spec - almost...

[baggins]

Author: baggins                      Date: Thu May 18 16:52:36 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- almost...

---- Files affected:
SPECS:
   opal.spec (1.10 -> 1.11) 

---- Diffs:

================================================================
Index: SPECS/opal.spec
diff -u SPECS/opal.spec:1.10 SPECS/opal.spec:1.11
--- SPECS/opal.spec:1.10	Wed May 17 19:57:56 2006
+++ SPECS/opal.spec	Thu May 18 18:52:31 2006
@@ -3,7 +3,7 @@
 Summary(pl):	Biblioteka Open Phone Abstraction Library (aka OpenH323 v2)
 Name:		opal
 Version:	2.2.1
-Release:	0.1
+Release:	0.2
 License:	MPL
 Group:		Libraries
 Source0:	http://www.ekiga.org/admin/downloads/latest/sources/sources/%{name}-%{version}.tar.gz
@@ -15,17 +15,16 @@
 BuildRequires:	speex-devel >= 1:1.1.5
 BuildRequires:	libstdc++-devel
 %requires_eq	pwlib
-Obsoletes:	openh323
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
-The OpenH323 project aims to create a full featured, interoperable,
+The OPAL project aims to create a full featured, interoperable,
 Open Source implementation of the ITU H.323 teleconferencing protocol
 that can be used by personal developers and commercial users without
 charge.
 
 %description -l pl
-Celem projektu OpenH323 jest stworzenie w pełni funkcjonalnej i
+Celem projektu OPAL jest stworzenie w pełni funkcjonalnej i
 wyposażonej implementacji protokołu telekonferencyjnego ITU H.323,
 który może być używany przez użytkowników prywatnych i komercyjnych
 bez opłat.
@@ -37,28 +36,26 @@
 Requires:	%{name} = %{version}
 Requires:	libstdc++-devel
 Requires:	pwlib-devel
-Obsoletes:	openh323-devel
 
 %description devel
 Header files and libraries for developing applications that use
-Opal.
+OPAL.
 
 %description devel -l pl
 Pliki nagłówkowe i biblioteki konieczne do rozwoju aplikacji
-używających Opal.
+używających OPAL.
 
 %package static
-Summary:	Opal static libraries
-Summary(pl):	Biblioteki statyczne Opal
+Summary:	OPAL static libraries
+Summary(pl):	Biblioteki statyczne OPAL
 Group:		Development/Libraries
 Requires:	%{name}-devel = %{version}
-Obsoletes:	openh323-static
 
 %description static
-OpenH323 static libraries.
+OPAL static libraries.
 
 %description static -l pl
-Biblioteki statyczne OpenH323.
+Biblioteki statyczne OPAL.
 
 %prep
 %setup -q
@@ -66,25 +63,18 @@
 
 %build
 PWLIBDIR=%{_prefix}; export PWLIBDIR
-#OPALDESTDIR=%{_prefix}; export OPALDIR
-#OPENH323_BUILD="yes"; export OPENH323_BUILD
-#cp -f /usr/share/automake/config.sub .
-#{__autoconf}
+OPALDIR=`pwd`; export OPALDIR
 %configure 
-#	--disable-iax
-#touch .asnparser.version
 
-%{__make}
-
-#%{__make} %{?debug:debug}%{!?debug:opt} \
-#		CC="%{__cc}" CPLUS=%{__cxx} \
-#		PWLIB_MAKE=%{_datadir}/pwlib \
-#		ASNPARSER=%{_bindir}/asnparser \
-#		OPTCCFLAGS="%{rpmcflags}"
-
-#%%{__make} -C samples/simple %{?debug:debugshared}%{!?debug:optshared} \
-#		CC="%{__cc}" CPLUS=%{__cxx} \
-#		OPTCCFLAGS="%{rpmcflags}"
+%{__make} %{?debug:debugshared}%{!?debug:optshared} \
+	CC="%{__cc}" \
+	CPLUS="%{__cxx}" \
+	OPTCCFLAGS="%{rpmcflags} %{!?debug:-DNDEBUG}"
+
+%{__make} -C samples/simple %{?debug:debugshared}%{!?debug:optshared} \
+	CC="%{__cc}" \
+	CPLUS=%{__cxx} \
+	OPTCCFLAGS="%{rpmcflags} %{!?debug:-DNDEBUG}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -93,14 +83,11 @@
 %{__make} install \
         DESTDIR=$RPM_BUILD_ROOT
 
-#using cp as install won't preserve links
-#cp -d lib/lib* $RPM_BUILD_ROOT%{_libdir}
-#install include/*.h $RPM_BUILD_ROOT%{_includedir}/openh323
-#install version.h $RPM_BUILD_ROOT%{_includedir}/openh323
-#install samples/simple/obj_*/simph323 $RPM_BUILD_ROOT%{_bindir}
-
-#sed -e's@\$(OPALDIR)/include@&/opal@' < opal_inc.mak \
-#	> $RPM_BUILD_ROOT%{_datadir}/opal/opal_inc1.mak
+# using cp as install won't preserve links
+cp -d %{_lib}/lib*.a $RPM_BUILD_ROOT%{_libdir}
+install version.h $RPM_BUILD_ROOT%{_includedir}/opal
+install samples/simple/obj_*/simpleopal $RPM_BUILD_ROOT%{_bindir}
+sed -i -e 's@\$(OPALDIR)/include@&/opal@' $RPM_BUILD_ROOT%{_datadir}/opal/opal_inc.mak
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -110,19 +97,18 @@
 
 %files
 %defattr(644,root,root,755)
-#%attr(755,root,root) %{_bindir}/*
+%attr(755,root,root) %{_bindir}/*
 %attr(755,root,root) %{_libdir}/lib*.so.*.*
 
 %files devel
 %defattr(644,root,root,755)
-#%doc *.txt
 %attr(755,root,root) %{_libdir}/*.so
 %{_includedir}/*
 %{_datadir}/%{name}
 
-#%files static
-#%defattr(644,root,root,755)
-#%{_libdir}/*.a
+%files static
+%defattr(644,root,root,755)
+%{_libdir}/*.a
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -130,6 +116,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.11  2006/05/18 16:52:31  baggins
+- almost...
+
 Revision 1.10  2006/05/17 17:57:56  baggins
 - WIP
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/opal.spec?r1=1.10&r2=1.11&f=u