Fix issue with having same files in multiple different packages.

Signed-off-by: Marko Saukko <marko.saukko@gmail.com>
sailfishos · Apr 10, 2012 · b8f4a41 · b8f4a41
1 parent 927287a
commit b8f4a41
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 12 deletions.
diff --git a/nss.changes b/nss.changes
@@ -1,3 +1,6 @@
+* Sat Apr 07 2012 Marko Saukko <sage@merproject.org> - 3.13.3
+- Some files are packaged twice by accident that causes conflicts.
+
 * Tue Feb 28 2012 Marko Saukko <marko.saukko@gmail.com> - 3.13.3
 - Fixes MER#58: Update to version 3.13.3.
 - Moved libs from /lib/ to /usr/lib/ part of MER#174

diff --git a/nss.spec b/nss.spec
@@ -342,18 +342,6 @@ done
 
 %files devel
 %defattr(-,root,root,-)
-%{_libdir}/libnss3.so
-%{_libdir}/libnssutil3.so
-%{_libdir}/libnssdbm3.so
-%{_libdir}/libssl3.so
-%{_libdir}/libsmime3.so
-%{_libdir}/libsoftokn3.so
-%{_libdir}/libsoftokn3.chk
-%{_libdir}/libnssckbi.so
-%{_libdir}/libnsspem.so
-%{_libdir}/libnsssysinit.so
-%{_libdir}/libfreebl3.so
-%{_libdir}/libfreebl3.chk
 %{_libdir}/libcrmf.a
 %{_libdir}/pkgconfig/nss.pc
 %{_bindir}/nss-config