-%doc README LICENSE NEWS TODO
-/usr/bin/yaz-client
-/usr/bin/yaz-ztest
-/usr/bin/zoomsh*
-/usr/bin/yaz-marcdump
-/usr/bin/yaz-iconv
-/usr/share/man/man1/yaz-client.*
-/usr/share/man/man8/yaz-ztest.*
-/usr/share/man/man1/zoomsh.*
-/usr/share/man/man1/yaz-marcdump.*
-/usr/share/man/man1/yaz-iconv.*
-/usr/share/man/man7/yaz-log.*
-
-%files -n lib%{name}
-/usr/lib/*.so.*
-/usr/share/man/man7/yaz.*
-/usr/share/yaz/etc
-
-%files -n lib%{name}-devel
-/usr/bin/yaz-config
-/usr/bin/yaz-asncomp
-/usr/include/yaz
-/usr/lib/*.so
-/usr/lib/*.a
-/usr/lib/*.la
-/usr/share/aclocal/yaz.m4
-/usr/share/man/man1/yaz-asncomp.*
-/usr/share/man/man8/yaz-config.*
-/usr/share/doc/yaz
-/usr/share/yaz/z39.50
-/usr/share/yaz/ill
+%doc README LICENSE NEWS
+%{_bindir}/yaz-client
+%{_bindir}/yaz-ztest
+%{_bindir}/zoomsh
+%{_bindir}/yaz-marcdump
+%{_bindir}/yaz-iconv
+%{_bindir}/yaz-json-parse
+%{_mandir}/man1/yaz-client.*
+%{_mandir}/man1/yaz-json-parse.*
+%{_mandir}/man8/yaz-ztest.*
+%{_mandir}/man1/zoomsh.*
+%{_mandir}/man1/yaz-marcdump.*
+%{_mandir}/man1/yaz-iconv.*
+%{_mandir}/man7/yaz-log.*
+%{_mandir}/man7/bib1-attr.*
+
+%files -n libyaz4
+%defattr(-,root,root)
+%{_libdir}/*.so.*
+
+%files -n libyaz4-devel
+%defattr(-,root,root)
+%{_bindir}/yaz-config
+%{_bindir}/yaz-asncomp
+%{_includedir}/yaz
+%{_libdir}/pkgconfig/yaz.pc
+%{_libdir}/*.so
+%{_libdir}/*.a
+%{_datadir}/aclocal/yaz.m4
+%{_mandir}/man1/yaz-asncomp.*
+%{_mandir}/man7/yaz.*
+%{_mandir}/man8/yaz-config.*
+%{_datadir}/doc/yaz
+%{_datadir}/yaz