SPECS: wxMozilla.spec - some cleanups

qboosh qboosh at pld-linux.org
Wed Dec 20 02:00:07 CET 2006


Author: qboosh                       Date: Wed Dec 20 01:00:07 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- some cleanups

---- Files affected:
SPECS:
   wxMozilla.spec (1.3 -> 1.4) 

---- Diffs:

================================================================
Index: SPECS/wxMozilla.spec
diff -u SPECS/wxMozilla.spec:1.3 SPECS/wxMozilla.spec:1.4
--- SPECS/wxMozilla.spec:1.3	Mon Dec 11 00:35:53 2006
+++ SPECS/wxMozilla.spec	Wed Dec 20 02:00:02 2006
@@ -22,14 +22,15 @@
 # Source0-md5:	f67edaaa17ed33a360c7c636b98b78fd
 Patch0:		%{name}-seamonkey.patch
 URL:		http://wxmozilla.sourceforge.net/
+BuildRequires:	autoconf
+BuildRequires:	automake
+BuildRequires:	nspr-devel
+BuildRequires:	seamonkey-devel
 BuildRequires:	wxGTK2-unicode-devel
-%{?with_x11:BuildRequires:	wxX11-unicode-devel
+%{?with_x11:BuildRequires:	wxX11-unicode-devel}
 %{?with_ansi:BuildRequires:	wxX11-devel}
-}
 %{?with_ansi:BuildRequires:	wxGTK2-devel}
 BuildRequires:	wxWidgets-devel
-BuildRequires:	nspr-devel
-BuildRequires:	seamonkey-devel
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -63,7 +64,7 @@
 Summary:	Header files for wxMozilla library GTK2, Unicode version
 Summary(pl):	Pliki nagłówkowe biblioteki wxMozilla wersja GTK2, Unicode
 Group:		Development/Libraries
-Requires:	%{name}-devel
+Requires:	%{name}-devel = %{version}-%{release}
 Requires:	wxGTK2-unicode
 
 %description wxGTK2-unicode-devel
@@ -72,7 +73,6 @@
 %description wxGTK2-unicode-devel -l pl
 Pliki nagłówkowe biblioteki wxMozilla wersja GTK2, Unicode
 
-
 %prep
 %setup -q -n %{_name}-%{version}
 %patch0 -p1
@@ -97,12 +97,8 @@
 
 done
 
-
 %install
 rm -rf $RPM_BUILD_ROOT
-# create directories if necessary
-#install -d $RPM_BUILD_ROOT
-#install -d $RPM_BUILD_ROOT%{_examplesdir}/%{name}-%{version}
 
 for gui in 'gtk2' %{?with_x11:'x11univ'} ; do
 
@@ -126,7 +122,7 @@
 %files devel
 %defattr(644,root,root,755)
 %doc AUTHORS ChangeLog NEWS README
-%{_includedir}/wxmozilla/*
+%{_includedir}/wxmozilla
 
 #%%files wxBase-devel
 #%%files wxBase-unicode-devel
@@ -134,10 +130,11 @@
 
 %files wxGTK2-unicode-devel
 %defattr(644,root,root,755)
+# FIXME: dup with -devel
 %{_includedir}/wx*
+# FIXME: perms, extensions?
 %{_libdir}/libwxmozilla_gtk2u*
-%{_libdir}/pkgconfig/wxmozilla-gtk2-unicode.pc
-
+%{_pkgconfigdir}/wxmozilla-gtk2-unicode.pc
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -145,6 +142,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.4  2006/12/20 01:00:02  qboosh
+- some cleanups
+
 Revision 1.3  2006/12/10 23:35:53  ggodlewski
 - fixed building, install, packaging
 - todo: x11 & ansi - I don't have them installed :/
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/wxMozilla.spec?r1=1.3&r2=1.4&f=u



More information about the pld-cvs-commit mailing list