SPECS: tora.spec - LDFLAGS patch is not really needed - fix libdir...

[baggins]

Author: baggins                      Date: Tue Apr 25 23:11:36 2006 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- LDFLAGS patch is not really needed
- fix libdir
- fix files

---- Files affected:
SPECS:
   tora.spec (1.28 -> 1.29) 

---- Diffs:

================================================================
Index: SPECS/tora.spec
diff -u SPECS/tora.spec:1.28 SPECS/tora.spec:1.29
--- SPECS/tora.spec:1.28	Wed Apr 26 01:02:54 2006
+++ SPECS/tora.spec	Wed Apr 26 01:11:31 2006
@@ -6,13 +6,12 @@
 Summary(pl):	Zestaf graficznych narzędzi dla programistów i administratorów baz danych
 Name:		tora
 Version:	1.3.21
-Release:	0.1
+Release:	0.2
 License:	GPL v2
 Group:		Applications/Databases/Interfaces
 Source0:	http://dl.sourceforge.net/tora/%{name}-%{version}.tar.gz
 # Source0-md5:	10e3c9944ffaca50de046e2c3e02eee4
 Source1:	%{name}.desktop
-Patch0:		%{name}-LDFLAGS.patch
 URL:		http://tora.sourceforge.net/
 BuildRequires:	kdelibs-devel
 BuildRequires:	qt-devel
@@ -30,24 +29,15 @@
 
 %prep
 %setup -q
-%patch0 -p1
 
 %build
-%{__libtoolize}
-%{__aclocal}
-%{__autoconf}
-%{__autoheader}
-%{__automake}
-cp -f /usr/share/automake/config.sub .
 %configure \
+	--libdir=%{_libdir}/%{name} \
 	--enable-plugin \
 	%{?with_oracle:--with-oracle}%{?without_oracle:--without-oracle}
 
 %{__make}
 
-%post   -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
-
 %install
 rm -rf $RPM_BUILD_ROOT
 install -d $RPM_BUILD_ROOT{%{_desktopdir},%{_pixmapsdir}} \
@@ -59,12 +49,12 @@
 install %{SOURCE1} $RPM_BUILD_ROOT%{_desktopdir}
 install icons/tora.xpm $RPM_BUILD_ROOT%{_pixmapsdir}
 
-install help/*.html $RPM_BUILD_ROOT%{_datadir}/%{name}/help/
-install help/images/*.png $RPM_BUILD_ROOT%{_datadir}/%{name}/help/images/
-install help/api/*.html $RPM_BUILD_ROOT%{_datadir}/%{name}/help/api/
+install help/*.html $RPM_BUILD_ROOT%{_libdir}/%{name}/help/
+install help/images/*.png $RPM_BUILD_ROOT%{_libdir}/%{name}/help/images/
+install help/api/*.html $RPM_BUILD_ROOT%{_libdir}/%{name}/help/api/
 
-install *.qm $RPM_BUILD_ROOT%{_datadir}/%{name}/
-install templates/*.tpl $RPM_BUILD_ROOT%{_datadir}/%{name}/
+install *.qm $RPM_BUILD_ROOT%{_libdir}/%{name}/
+install templates/*.tpl $RPM_BUILD_ROOT%{_libdir}/%{name}/
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -73,9 +63,14 @@
 %defattr(644,root,root,755)
 %doc BUGS NEWS README TODO
 %attr(755,root,root) %{_bindir}/*
-%{_libdir}/lib*.so.*.*.*
 %dir %{_datadir}/%{name}
-%{_datadir}/%{name}/*
+%attr(755,root,root) %{_libdir}/%{name}/lib*.so
+%{_libdir}/%{name}/lib*.la
+# Needed?
+%{_libdir}/%{name}/lib*.a
+%{_libdir}/%{name}/help
+%{_libdir}/%{name}/*.tpl
+%{_libdir}/%{name}/*.qm
 %{_desktopdir}/*
 %{_pixmapsdir}/*
 
@@ -85,6 +80,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.29  2006/04/25 23:11:31  baggins
+- LDFLAGS patch is not really needed
+- fix libdir
+- fix files
+
 Revision 1.28  2006/04/25 23:02:54  prism
 - URL fix, case-sensitive name (which should be kept unified, IMHO)
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/tora.spec?r1=1.28&r2=1.29&f=u