SPECS: linphone.spec - cleanups

[qboosh]

Author: qboosh                       Date: Thu Mar 23 10:33:33 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- cleanups

---- Files affected:
SPECS:
   linphone.spec (1.39 -> 1.40) 

---- Diffs:

================================================================
Index: SPECS/linphone.spec
diff -u SPECS/linphone.spec:1.39 SPECS/linphone.spec:1.40
--- SPECS/linphone.spec:1.39	Fri Mar 17 20:48:55 2006
+++ SPECS/linphone.spec	Thu Mar 23 11:33:27 2006
@@ -31,6 +31,7 @@
 BuildRequires:	libtool >= 1:1.4.2-9
 #BuildRequires:	lpc10-devel >= 1.5
 BuildRequires:	pkgconfig
+BuildRequires:	rpmbuild(macros) >= 1.98
 BuildRequires:	scrollkeeper
 BuildRequires:	speex-devel >= 1.0.0
 BuildRequires:	xft-devel
@@ -38,9 +39,6 @@
 Requires(post,postun):	/usr/bin/scrollkeeper-update
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
-%define		_sysconfdir	/etc/X11/GNOME
-%define		_gtkdocdir	%{_defaultdocdir}/gtk-doc/html
-
 %description
 Linphone is a web phone: it let you phone to your friends anywhere in
 the whole world, freely, simply by using the internet. The cost of the
@@ -100,9 +98,8 @@
 #%patch2 -p1
 
 %build
-rm -f missing
-# gettext 0.11.5 used
-#%%{__gettextize}
+# requires .po file fixes
+#%%{__glib_gettextize}
 %{__libtoolize}
 %{__aclocal} -I m4
 %{__autoconf}
@@ -124,19 +121,16 @@
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT%{_desktopdir} \
-	$RPM_BUILD_ROOT%{_sysconfdir}/CORBA/servers \
 	$RPM_BUILD_ROOT%{_pixmapsdir}
 
 %{__make} install \
-	DESTDIR=$RPM_BUILD_ROOT \
-	HTML_DIR=%{_gtkdocdir}
+	DESTDIR=$RPM_BUILD_ROOT
 
 install share/linphone.desktop $RPM_BUILD_ROOT%{_desktopdir}
-install share/linphone.gnorba $RPM_BUILD_ROOT%{_sysconfdir}/CORBA/servers
 install pixmaps/*.png pixmaps/*.xpm $RPM_BUILD_ROOT%{_pixmapsdir}
 
-rm -f $RPM_BUILD_ROOT%{_includedir}/speex*
-rm -f $RPM_BUILD_ROOT%{_libdir}/libspeex*
+# kill .desktop in GNOME1-specific location
+rm -rf $RPM_BUILD_ROOT%{_datadir}/gnome/apps
 
 %find_lang %{name} --with-gnome --all-name
 
@@ -154,23 +148,21 @@
 %files -f %{name}.lang
 %defattr(644,root,root,755)
 %doc AUTHORS BUGS ChangeLog NEWS README TODO
-%config(noreplace) %{_sysconfdir}/CORBA/servers/*
 %attr(755,root,root) %{_bindir}/*
 %attr(755,root,root) %{_libdir}/lib*.so.*.*
-%{_desktopdir}/*
-%{_pixmapsdir}/*
-%{_datadir}/sounds/*
-%{_mandir}/man*/*
+%attr(755,root,root) %{_libdir}/linphone_applet
 %{_libdir}/mediastream
-%{_datadir}/gnome/apps/Internet/linphone.desktop
 %{_libdir}/bonobo/servers/GNOME_LinphoneApplet.server
-%attr(755,root,root) %{_libdir}/linphone_applet
 %{_datadir}/gnome-2.0/ui/GNOME_LinphoneApplet.xml
+%{_datadir}/sounds/*
+%{_desktopdir}/*
+%{_pixmapsdir}/*
+%{_mandir}/man1/*
 
 %files devel
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/*.so
-%{_libdir}/*.la
+%attr(755,root,root) %{_libdir}/lib*.so
+%{_libdir}/lib*.la
 %{_includedir}/linphone
 %{_includedir}/ortp
 %{_gtkdocdir}/*
@@ -178,7 +170,7 @@
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/*.a
+%{_libdir}/lib*.a
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -186,6 +178,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.40  2006/03/23 10:33:27  qboosh
+- cleanups
+
 Revision 1.39  2006/03/17 19:48:55  rotom
 - just updated to 1.3.2
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/linphone.spec?r1=1.39&r2=1.40&f=u