RPM Packaging: update existing SPEC files

8 files changed, 4 insertions, 185 deletions

diff --git a/redhat/dependencies/arts/trinity-arts-3.5.12.spec b/redhat/dependencies/arts/trinity-arts-3.5.12.spec
index 1a72133d6..1a72133d6 100755..100644
--- a/redhat/dependencies/arts/trinity-arts-3.5.12.spec
+++ b/redhat/dependencies/arts/trinity-arts-3.5.12.spec
diff --git a/redhat/dependencies/arts/trinity-arts-3.5.13.1.spec b/redhat/dependencies/arts/trinity-arts-3.5.13.1.spec
index 03a922e4e..03a922e4e 100755..100644
--- a/redhat/dependencies/arts/trinity-arts-3.5.13.1.spec
+++ b/redhat/dependencies/arts/trinity-arts-3.5.13.1.spec
diff --git a/redhat/dependencies/arts/trinity-arts-3.5.13.spec b/redhat/dependencies/arts/trinity-arts-3.5.13.spec
index af9fef33a..af9fef33a 100755..100644
--- a/redhat/dependencies/arts/trinity-arts-3.5.13.spec
+++ b/redhat/dependencies/arts/trinity-arts-3.5.13.spec
diff --git a/redhat/dependencies/arts/trinity-arts-r14.spec b/redhat/dependencies/arts/trinity-arts-r14.spec
index 4e9c33264..4e9c33264 100755..100644
--- a/redhat/dependencies/arts/trinity-arts-r14.spec
+++ b/redhat/dependencies/arts/trinity-arts-r14.spec
diff --git a/redhat/dependencies/libcaldav/libcaldav.spec b/redhat/dependencies/libcaldav/libcaldav.spec
index 9d41aba39..0d6745c90 100644
--- a/redhat/dependencies/libcaldav/libcaldav.spec
+++ b/redhat/dependencies/libcaldav/libcaldav.spec
@@ -103,10 +103,12 @@ autoreconf --force --install --symlink
 
 
 %files
+%defattr(-,root,root,-)
 %{tde_libdir}/*.so.*
 %{tde_docdir}/libcaldav/
 
 %files devel
+%defattr(-,root,root,-)
 %{tde_includedir}/caldav.h
 %{tde_libdir}/*.la
 %{tde_libdir}/*.so
diff --git a/redhat/dependencies/libcarddav/libcarddav.spec b/redhat/dependencies/libcarddav/libcarddav.spec
index ced6601c2..8c4f62ff7 100644
--- a/redhat/dependencies/libcarddav/libcarddav.spec
+++ b/redhat/dependencies/libcarddav/libcarddav.spec
@@ -100,9 +100,11 @@ autoreconf --force --install --symlink
 
 
 %files
+%defattr(-,root,root,-)
 %{tde_libdir}/*.so.*
 
 %files devel
+%defattr(-,root,root,-)
 %{tde_includedir}/*.h
 %{tde_libdir}/*.la
 %{tde_libdir}/*.so
diff --git a/redhat/dependencies/tqca-tls/tqca-tls.spec b/redhat/dependencies/tqca-tls/tqca-tls.spec
deleted file mode 100644
index f95290a0e..000000000
--- a/redhat/dependencies/tqca-tls/tqca-tls.spec
+++ /dev/null
@@ -1,65 +0,0 @@
-# Always build under "/usr"
-%define _prefix /usr
-
-Name:		tqca-tls
-Version:	r14
-Release:	1%{?dist}
-
-Summary:	TLS plugin for the Qt Cryptographic Architecture
-License:	LGPLv2+
-Group:		Applications/Internet
-
-URL:		http://delta.affinix.com/qca/
-Vendor:		Trinity Project
-Packager:	Francois Andriot <francois.andriot@free.fr>
-
-BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Source0:	%{name}-%{version}.tar.gz
-
-# Fix build in mach for QT apps
-Patch0:		qca-tls-1.0-mach.patch
-# Build with openssl 1.0.0
-Patch2:     qca-tls-1.0-ossl10.patch
-# Allows building with TQT3 from TDE
-Patch10:	tqca-tls-qmake-tqt3.patch
-
-BuildRequires:	tqt3-devel >= 3.4.0
-BuildRequires:	openssl-devel >= 0.9.8
-
-
-%description
-This is a plugin to provide SSL/TLS capability to programs that use the TQt
-Cryptographic Architecture (TQCA).  TQCA is a library providing an easy API
-for several cryptographic algorithms to TQt programs.  This package only
-contains the TLS plugin.
-
-
-%prep
-%setup -q -n dependencies/%{name}
-%patch0 -p0 -b .mach
-%patch2 -p1 -b .ossl10
-%patch10 -p1
-
-%build
-./configure
-%__make %{?_smp_mflags}
-
-%install
-%__rm -rf %{?buildroot}
-%__make install INSTALL_ROOT=%{?buildroot}
-
-%clean
-%__rm -rf %{?buildroot}
-
-
-%files
-%defattr(0644,root,root,0755)
-%doc README COPYING
-%attr(755,root,root) %{_libdir}/tqt3/plugins/crypto
-
-
-%changelog
-* Sat Feb 18 2012 Francois Andriot <francois.andriot@free.fr> - r14-1
-- Initial build for TDE R14
-- Spec file based on Fedora 12 'qca-tls-1.0-18'
diff --git a/redhat/dependencies/tqca/tqca.spec b/redhat/dependencies/tqca/tqca.spec
deleted file mode 100644
index 5d5f57670..000000000
--- a/redhat/dependencies/tqca/tqca.spec
+++ /dev/null
@@ -1,120 +0,0 @@
-%define _prefix /opt/trinity
-
-Name:           tqca
-Version:        1.0
-Release:        r14.1%{?dist}
-
-Summary:        TQt Cryptographic Architecture
-
-Group:          System Environment/Libraries
-License:        LGPLv2+
-URL:            http://delta.affinix.com/qca
-Source0:        %{name}-r14.tar.gz
-Patch0:         qca-1.0-mach.patch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-
-Patch1:			tqca-1.0-fix_tqt3_detection.patch
-
-BuildRequires:  tqt3-devel
-BuildRequires:  tqtinterface-devel
-
-%description
-Taking a hint from the similarly-named Java Cryptography Architecture,
-QCA aims to provide a straightforward and cross-platform crypto API,
-using Qt datatypes and conventions. QCA separates the API from the
-implementation, using plugins known as Providers. The advantage of this
-model is to allow applications to avoid linking to or explicitly depending
-on any particular cryptographic library. This allows one to easily change
-or upgrade crypto implementations without even needing to recompile the
-application!
-
-%package        devel
-Summary:        Qt Cryptographic Architecture development files
-Group:          Development/Libraries
-Requires:       %{name} = %{version}-%{release}
-
-%description    devel
-This packages contains the development files for QCA
-
-%prep
-%setup -q -n dependencies/tqca
-%patch0 -p0 -b .mach
-%patch1 -p1
-perl -pi -e 's,target\.path=\$PREFIX/lib,target.path=\$PREFIX/%{_lib},g' qcextra
-
-
-%build
-./configure \
-  --prefix=%{_prefix}
-
-sed -i -e /strip/d Makefile
-make %{?_smp_mflags}
-
-
-%install
-rm -rf $RPM_BUILD_ROOT
-make install INSTALL_ROOT=$RPM_BUILD_ROOT
-
-
-%clean
-rm -rf $RPM_BUILD_ROOT
-
-
-%post
-/sbin/ldconfig
-
-%postun
-/sbin/ldconfig
-
-
-%files
-%defattr(-,root,root,-)
-%doc COPYING README TODO
-%{_libdir}/*.so.*
-
-%files devel
-%defattr(-,root,root,-)
-%{_includedir}/*.h
-%{_libdir}/*.so
-
-
-%changelog
-* Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0-13
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0-12
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Thu Jun 05 2008 Aurelien Bompard <abompard@fedoraproject.org> 1.0-11
-- fix build
-
-* Mon Feb 18 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 1.0-10
-- Autorebuild for GCC 4.3
-
-* Sun Aug 26 2007 Aurelien Bompard <abompard@fedoraproject.org> 1.0-9
-- fix license tag
-
-* Wed Aug 30 2006 Aurelien Bompard <abompard@fedoraproject.org> 1.0-8
-- rebuild
-
-* Sat Apr 08 2006 Aurelien Bompard <gauret[AT]free.fr> 1.0-7
-- disable stripping (bug 186648)
-
-* Tue Feb 21 2006 Aurelien Bompard <gauret[AT]free.fr> 1.0-6
-- rebuild for FC5
-
-* Sun May 22 2005 Jeremy Katz <katzj@redhat.com> - 1.0-5
-- rebuild on all arches
-
-* Fri Apr  7 2005 Michael Schwendt <mschwendt[AT]users.sf.net>
-- rebuilt
-
-* Thu Jan 13 2005 Aurelien Bompard <gauret[AT]free.fr> 0:1.0-3
-- fix Category
-- fix build on x86_64
-
-* Thu Jan 13 2005 Aurelien Bompard <gauret[AT]free.fr> 0:1.0-0.fdr.2
-- clean up comments to fix %%postun scriptlet.
-
-* Mon Nov 22 2004 Aurelien Bompard <gauret[AT]free.fr> 0:1.0-0.fdr.1
-- Initial RPM release.