packages: libtqtinterface/libtqtinterface.spec - add -devel - use private i...

[glen]

Author: glen                         Date: Tue Jan  4 21:38:18 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- add -devel
- use private includedir, to avoid noise
- drop qt4 headers copy
- drop libltdl copy

---- Files affected:
packages/libtqtinterface:
   libtqtinterface.spec (1.2 -> 1.3) 

---- Diffs:

================================================================
Index: packages/libtqtinterface/libtqtinterface.spec
diff -u packages/libtqtinterface/libtqtinterface.spec:1.2 packages/libtqtinterface/libtqtinterface.spec:1.3
--- packages/libtqtinterface/libtqtinterface.spec:1.2	Tue Jan  4 22:06:49 2011
+++ packages/libtqtinterface/libtqtinterface.spec	Tue Jan  4 22:38:13 2011
@@ -3,6 +3,7 @@
 # - for some unknown reason to me it creates dead symlinks instead of libtqt shared library
 #   libtool: install: /usr/bin/install -c -p .libs/libtqt.so.4.2.0 /tmp/xxx/usr/lib64/libtqt.so.4.2.0
 #   /usr/bin/install: cannot stat `.libs/libtqt.so.4.2.0': No such file or directory
+#   workarounded in spec r1.2 commit
 #
 # Conditional build:
 %bcond_with		qt4     # Enable Qt4 support (this will disable all Qt3 support)
@@ -22,6 +23,7 @@
 BuildRequires:	libtool
 BuildRequires:	pkgconfig
 BuildRequires:	qt-devel
+BuildRequires:	sed >= 4.0
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -35,10 +37,30 @@
 perform certain operations that are infeasible or unneccessarily
 difficult when using pure Qt4 or above.
 
+%package devel
+Summary:	Header files for libtqtinterface library
+Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki libtqtinterface
+Group:		Development/Libraries
+Requires:	%{name} = %{version}-%{release}
+
+%description devel
+Header files for libtqtinterface library.
+
+%description devel -l pl.UTF-8
+Pliki nagłówkowe biblioteki libtqtinterface.
+
 %prep
 %setup -qc
 mv dependencies/tqtinterface/* .
 
+# libtool copy
+rm -r libltdl
+%{__sed} -i -e '/ltdl.m4/d' Makefile.am.in
+
+# remove copy of QtCore and QtGui devel headers
+rm -r qtinterface/qt4 qtinterface/tqt4
+%{__sed} -i -e /tqt4/d qtinterface/Makefile.am
+
 %build
 cp -p /usr/share/automake/config.sub admin
 cp -p %{_aclocaldir}/libtool.m4 admin/libtool.m4.in
@@ -48,11 +70,12 @@
 %configure \
 	--%{?debug:en}%{!?debug:dis}able-debug%{?debug:=full} \
 	--disable-final \
-	--enable-closure \
+	--disable-static \
+	--includedir=%{_includedir}/tqt \
 %if "%{_lib}" == "lib64"
 	--enable-libsuffix=64 \
 %endif
-	--%{!?with_qt4:dis}%{?with_qt4:en}able-qt4
+	%{?with_qt4:--enable-qt4}
 
 %{__make} \
 	LIBTOOL="%{_bindir}/libtool -v"
@@ -62,12 +85,37 @@
 %{__make} install \
 	DESTDIR=$RPM_BUILD_ROOT \
 
+# --disable-static did not work, rm it again
+rm $RPM_BUILD_ROOT%{_libdir}/libtqt.a
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
+%post	-p /sbin/ldconfig
+%postun	-p /sbin/ldconfig
+
 %files
 %defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libtqt.so.*.*.*
+%ghost %attr(755,root,root) %{_libdir}/libtqt.so.4
+
+%files devel
+%defattr(644,root,root,755)
 %doc AUTHORS COPYING README
+%attr(755,root,root) %{_bindir}/convert_qt_tqt1
+%attr(755,root,root) %{_bindir}/convert_qt_tqt2
+%attr(755,root,root) %{_bindir}/convert_qt_tqt3
+%attr(755,root,root) %{_bindir}/dcopidl-tqt
+%attr(755,root,root) %{_bindir}/dcopidl2cpp-tqt
+%attr(755,root,root) %{_bindir}/dcopidlng-tqt
+%attr(755,root,root) %{_bindir}/mcopidl-tqt
+%attr(755,root,root) %{_bindir}/moc-tqt
+%attr(755,root,root) %{_bindir}/tqt-replace
+%attr(755,root,root) %{_bindir}/tqt-replace-stream
+%dir %{_includedir}/tqt
+%{_includedir}/tqt/tq*.h
+%{_libdir}/libtqt.la
+%{_libdir}/libtqt.so
 
 %define date	%(echo `LC_ALL="C" date +"%a %b %d %Y"`)
 %changelog
@@ -75,6 +123,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.3  2011/01/04 21:38:13  glen
+- add -devel
+- use private includedir, to avoid noise
+- drop qt4 headers copy
+- drop libltdl copy
+
 Revision 1.2  2011/01/04 21:06:49  sparky
 - BR: libltdl-devel, pkgconfig
 - force our libtool to fix build
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/libtqtinterface/libtqtinterface.spec?r1=1.2&r2=1.3&f=u