X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=e2fsprogs.spec;h=4938a87e2c43be91aa1ebbea057ad720342ff296;hb=2c1bd61a1269dfa6fa86a16c72b4ab9668df5d85;hp=2701e10da6879fc3a398a727e77afd173801762f;hpb=558ab019d6029b81d289674ec12560c5aea56bc9;p=packages%2Fe2fsprogs.git

diff --git a/e2fsprogs.spec b/e2fsprogs.spec
index 2701e10..4938a87 100644
--- a/e2fsprogs.spec
+++ b/e2fsprogs.spec
@@ -35,12 +35,12 @@ Summary(uk.UTF-8):	Утиліти для роботи з файловою сис
 Summary(zh_CN.UTF-8):	管理第二扩展（ext2）文件系统的工具。
 Summary(zh_TW.UTF-8):	用於管理 ext2 檔案系統的工具程式。
 Name:		e2fsprogs
-Version:	1.41.4
-Release:	2
+Version:	1.41.14
+Release:	1
 License:	GPL v2 (with LGPL v2 and BSD parts)
 Group:		Applications/System
-Source0:	http://dl.sourceforge.net/e2fsprogs/%{name}-%{version}.tar.gz
-# Source0-md5:	59033388df36987d2b9c9bbf7e19bd57
+Source0:	http://downloads.sourceforge.net/e2fsprogs/%{name}-%{version}.tar.gz
+# Source0-md5:	05f70470aea2ef7efbb0845b2b116720
 Source1:	e2compr-0.4.texinfo.gz
 # Source1-md5:	c3c59ff37e49d8759abb1ef95a8d3abf
 Source2:	http://www.mif.pg.gda.pl/homepages/ankry/man-PLD/%{name}-non-english-man-pages.tar.bz2
@@ -53,28 +53,35 @@ URL:		http://e2fsprogs.sourceforge.net/
 BuildRequires:	autoconf >= 2.50
 BuildRequires:	automake
 BuildRequires:	gettext-devel >= 0.11
+BuildRequires:	libblkid-devel
+BuildRequires:	libuuid-devel
+BuildRequires:	pkgconfig
 BuildRequires:	rpmbuild(macros) >= 1.426
 BuildRequires:	texinfo
+BuildRequires:	texinfo-texi2dvi
 %if %{with allstatic}
 BuildRequires:	glibc-static
-BuildRequires:	libselinux-static
-BuildRequires:	libsepol-static
 %endif
 %if %{with initrd}
 	%if %{with uClibc}
 BuildRequires:	uClibc-static >= 2:0.9.29
 	%else
 		%if %{with dietlibc}
-BuildRequires:	dietlibc-static
+BuildRequires:	dietlibc-static >= 2:0.32-9
+BuildRequires:	libblkid-dietlibc
+BuildRequires:	libuuid-dietlibc
 		%else
 BuildRequires:	glibc-static
+BuildRequires:	libblkid-static
+BuildRequires:	libuuid-static
 		%endif
 	%endif
 %endif
 Requires(post,postun):	/sbin/ldconfig
-Requires:	fsck = %{version}-%{release}
+Requires:	%{name}-libs = %{version}-%{release}
+Requires:	fsck
 Requires:	libcom_err = %{version}-%{release}
-Requires:	libuuid = %{version}-%{release}
+Requires:	libss = %{version}-%{release}
 Obsoletes:	e2fsprogs-evms
 Obsoletes:	libext2fs2
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
@@ -86,6 +93,11 @@ BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 %define		dietarch	%(echo %{_target_cpu} | sed -e 's/i.86\\|pentium.\\|athlon/i386/;s/amd64/x86_64/;s/armv.*/arm/')
 %define		dietlibdir	%{_prefix}/lib/dietlibc/lib-%{dietarch}
 
+%ifarch ppc ppc64
+# for dietlibc
+%define		filterout_ld	-Wl,-z,relro
+%endif
+
 %description
 The e2fsprogs package contains a number of utilities for creating,
 checking, modifying and correcting any inconsistencies in second
@@ -301,6 +313,7 @@ ext2fs 文件系统实用程序。
 Summary:	ext2 filesystem-specific libraries
 Summary(pl.UTF-8):	Biblioteki dla systemu plików ext2
 Group:		Libraries
+Requires:	libcom_err = %{version}-%{release}
 Conflicts:	e2fsprogs < 1.40.6-3
 Conflicts:	fsck < 1.40.6-3
 
@@ -338,7 +351,7 @@ Group:		Development/Libraries
 Requires:	%{name}-libs = %{version}-%{release}
 %endif
 Requires:	libcom_err-devel = %{version}-%{release}
-Requires:	libuuid-devel = %{version}-%{release}
+Requires:	libuuid-devel
 Obsoletes:	libext2fs2-devel
 
 %description devel
@@ -511,117 +524,63 @@ A Common Error Description Library for unices - static version.
 %description -n libcom_err-static -l pl.UTF-8
 Biblioteka opisu popularnych błędów dla uniksów - wersja statyczna.
 
-%package -n libuuid
-Summary:	Library for accessing and manipulating UUID
-Summary(pl.UTF-8):	Biblioteka umożliwiająca dostęp i zmiany UUID
-License:	BSD
+%package -n libss
+Summary:	Subsystem command parsing library
+Summary(pl.UTF-8):	Biblioteka analizy poleceń podsystemów
 Group:		Libraries
+Requires:	libcom_err = %{version}-%{release}
 Conflicts:	e2fsprogs < 1.34-3
+Conflicts:	e2fsprogs-libs < 1.41.11-2
 
-%description -n libuuid
-Library for accessing and manipulating UUID.
+%description -n libss
+Subsystem command parsing library.
 
-%description -n libuuid -l pl.UTF-8
-Biblioteka umożliwiająca dostęp i zmiany UUID.
+%description -n libss -l pl.UTF-8
+Biblioteka analizy poleceń podsystemów.
 
-%package -n libuuid-devel
-Summary:	Header files for library for accessing and manipulating UUID
-Summary(pl.UTF-8):	Pliki nagłówkowe biblioteki umożliwiającej dostęp i zmiany UUID
-License:	BSD
+%package -n libss-devel
+Summary:	Development files for subsystem command parsing library
+Summary(pl.UTF-8):	Pliki dla programistów do biblioteki analizy poleceń podsystemów
 Group:		Development/Libraries
-Requires:	libuuid = %{version}-%{release}
-Conflicts:	e2fsprogs-devel < 1.34-3
-
-%description -n libuuid-devel
-Library for accessing and manipulating UUID - development files.
-
-%description -n libuuid-devel -l pl.UTF-8
-Biblioteka umożliwiająca dostęp i zmiany UUID - pliki dla
-programistów.
-
-%package -n libuuid-static
-Summary:	Static library for accessing and manipulating UUID
-Summary(pl.UTF-8):	Statyczna biblioteka umożliwiająca dostęp i zmiany UUID
-License:	BSD
-Group:		Development/Libraries
-Requires:	libuuid-devel = %{version}-%{release}
-Conflicts:	e2fsprogs-static < 1.34-3
+Requires:	libcom_err-devel = %{version}-%{release}
+Requires:	libss = %{version}-%{release}
+Conflicts:	e2fsprogs < 1.41.11-2
+Conflicts:	e2fsprogs-devel < 1.41.11-2
 
-%description -n libuuid-static
-Library for accessing and manipulating UUID - static version.
+%description -n libss-devel
+Development files for subsystem command parsing library, including
+header files and mk_cmds utility.
 
-%description -n libuuid-static -l pl.UTF-8
-Biblioteka umożliwiająca dostęp i zmiany UUID - wersja statyczna.
+%description -n libss-devel -l pl.UTF-8
+Biblioteka opisu popularPliki dla programistów do biblioteki analizy
+poleceń podsystemów - w tym pliki nagłówkowe i narzędzie mk_cmds.
 
-%package -n libuuid-dietlibc
-Summary:	Static dietlibc library for accessing and manipulating UUID
-Summary(pl.UTF-8):	Statyczna biblioteka dietlibc umożliwiająca dostęp i zmiany UUID
-License:	BSD
+%package -n libss-static
+Summary:	Static version of subsystem command parsing library
+Summary(pl.UTF-8):	Statyczna wersja biblioteki analizy poleceń podsystemów
 Group:		Development/Libraries
-Requires:	libuuid-devel = %{version}-%{release}
-Conflicts:	e2fsprogs-static < 1.34-3
-
-%description -n libuuid-dietlibc
-Library for accessing and manipulating UUID - static dietlibc version.
-
-%description -n libuuid-dietlibc -l pl.UTF-8
-Biblioteka umożliwiająca dostęp i zmiany UUID - wersja statyczna dietlibc.
-
-%package -n uuidd
-Summary:	Helper daemon to guarantee uniqueness of time-based UUIDs
-Summary(pl.UTF-8):	Pomocniczy demon gwarantujący unikalność UUID-ów opartych na czasie
-License:	GPL v2
-Group:		Daemons
-Requires(postun):	/usr/sbin/groupdel
-Requires(postun):	/usr/sbin/userdel
-Requires(pre):	/bin/id
-Requires(pre):	/usr/bin/getgid
-Requires(pre):	/usr/sbin/groupadd
-Requires(pre):	/usr/sbin/groupmod
-Requires(pre):	/usr/sbin/useradd
-Requires(pre):	/usr/sbin/usermod
-Requires:	libuuid = %{version}-%{release}
-Provides:	group(uuidd)
-Provides:	user(uuidd)
-Conflicts:	libuuid < 1.40.5-0.1
-
-%description -n uuidd
-The uuidd package contains a userspace daemon (uuidd) which guarantees
-uniqueness of time-based UUID generation even at very high rates on
-SMP systems.
-
-%description -n uuidd -l pl.UTF-8
-Ten pakiet zawiera działającego w przestrzeni użytkownika demona
-(uuidd) gwarantującego unikalność generowania UUID-ów opartych na
-czasie nawet przy bardzo dużej częstotliwości na systemach SMP.
-
-%package -n fsck
-Summary:	Check and repair a Linux file system
-Summary(pl.UTF-8):	Sprawdzenie i naprawa linuksowego systemu plików
-Group:		Applications/System
-%if %{without allstatic}
-Requires:	%{name}-libs = %{version}-%{release}
-%endif
-Requires:	libuuid = %{version}-%{release}
+Requires:	libss-devel = %{version}-%{release}
+Conflicts:	e2fsprogs-static < 1.41.11-2
 
-%description -n fsck
-Check and repair a Linux file system.
+%description -n libss-static
+Static version of subsystem command parsing library.
 
-%description -n fsck -l pl.UTF-8
-Sprawdzenie i naprawa linuksowego systemu plików.
+%description -n libss-static -l pl.UTF-8
+Statyczna wersja biblioteki analizy poleceń podsystemów.
 
 %package initrd
-Summary:	blkid - initrd version
-Summary(pl.UTF-8):	blkid - wersja dla initrd
+Summary:	e2fsck and mke2fs - initrd version
+Summary(pl.UTF-8):	e2fsck i mke2fs - wersja dla initrd
 Group:		Base
+Conflicts:	geninitrd < 10000.10
 
 %description initrd
-This package includes a blkid utility to recognize partitions by label
-or UUID - staticaly linked for initrd.
+This package includes a e2fsck and mke2fs utilities staticaly linked
+for initrd.
 
 %description initrd -l pl.UTF-8
-Pakiet ten zawiera narzędzie blkid do rozpoznawania partycji przez
-etykietę lub UUID - statycznie skonsolidowane na potrzeby initrd.
+Pakiet ten zawiera narzędzia e2fsck i mke2fs statycznie skonsolidowane
+na potrzeby initrd.
 
 %prep
 %setup -q
@@ -645,51 +604,60 @@ cp -f /usr/share/automake/config.sub .
 %if %{with initrd}
 %if %{with dietlibc}
 # needed for syscall()
+cp -a MCONFIG.in MCONFIG.in.org
 sed -i -e 's|\(^LIBUUID = .*\)|\1 -lcompat|g' \
 	-e 's|\(^STATIC_LIBUUID = .*\)|\1 -lcompat|g' MCONFIG.in
 %endif
 %configure \
 	ac_cv_lib_dl_dlopen=no \
 	%{?with_uClibc:CC="%{_target_cpu}-uclibc-gcc"} \
-	%{?with_dietlibc:--with-cc="diet %{__cc}"} \
-	--with-ccopts="-Os" \
-	--with-ldopts="-static" \
+	%{?with_dietlibc:CC="diet %{__cc}"} \
+	CFLAGS="%{rpmcflags} -Os" \
+	LDFLAGS="%{rpmldflags} -static" \
+%if %{with dietlibc}
+	LIBUUID_LIBADD="-lcompat" \
+	LIBBLKID_LIBADD="-luuid -lcompat" \
+%else
+	LIBBLKID_LIBADD="-luuid" \
+%endif
 	--disable-elf-shlibs \
-	--disable-selinux \
+	--disable-fsck \
+	--disable-libblkid \
+	--disable-libuuid \
 	--disable-nls \
 	--disable-testio-debug \
 	--disable-e2initrd-helper \
-	--disable-uuidd \
+	--disable-threads \
 	--disable-tls \
-	--disable-nls \
-	--disable-threads
+	--disable-uuidd
 
-%{__make} -j1 libs
-%{__make} progs
-mv -f misc/blkid initrd-blkid
+%{__make} -j1 libs \
+	V=1
+%{__make} progs \
+	V=1
 mv -f misc/mke2fs initrd-mke2fs
-mv -f misc/fsck initrd-e2fsck
-%if %{with dietlibc}
-sed -i -e 's|\(^LIBUUID = .*\) -lcompat|\1|g' \
-	-e 's|\(^STATIC_LIBUUID = .*\) -lcompat|\1|g' MCONFIG.in
-mv -f lib/uuid/libuuid.a diet-libuuid.a
-%endif
 %{__make} clean
+%{?with_dietlibc:mv MCONFIG.in.org MCONFIG.in}
 %endif
 
 %configure \
 	--with-root-prefix="" \
+	--disable-fsck \
+	--disable-libblkid \
+	--disable-libuuid \
 	%{!?with_nls:--disable-nls} \
-	%{!?with_allstatic:--enable-elf-shlibs} \
+	--disable-rpath \
+	--disable-uuidd \
 	--enable-compression \
-	--enable-htree \
-	--enable-fsck \
-	--disable-rpath
+	%{!?with_allstatic:--enable-elf-shlibs} \
+	--enable-htree
 
 %{__make} -j1 libs \
-	LDFLAGS="%{rpmldflags}"
+	LDFLAGS="%{rpmldflags}" \
+	V=1
 %{__make} progs docs \
-	LDFLAGS="%{rpmldflags}"
+	LDFLAGS="%{rpmldflags}" \
+	V=1
 
 cd doc
 makeinfo --no-split e2compr.texinfo
@@ -699,8 +667,6 @@ rm -rf $RPM_BUILD_ROOT
 %{?with_dietlibc:install -d $RPM_BUILD_ROOT%{dietlibdir}}
 export PATH=/sbin:$PATH
 
-install -d $RPM_BUILD_ROOT/var/lib/libuuid
-
 echo "install-shlibs:" >> intl/Makefile
 
 %{__make} install install-libs \
@@ -752,6 +718,12 @@ echo '.so e2fsck.8' > $RPM_BUILD_ROOT%{_mandir}/pl/man8/fsck.ext4dev.8
 echo '.so mke2fs.8' > $RPM_BUILD_ROOT%{_mandir}/pl/man8/mkfs.ext3.8
 echo '.so mke2fs.8' > $RPM_BUILD_ROOT%{_mandir}/pl/man8/mkfs.ext4.8
 echo '.so mke2fs.8' > $RPM_BUILD_ROOT%{_mandir}/pl/man8/mkfs.ext4dev.8
+# moved to util-linux-ng.spec
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/*/man1/uuidgen.1
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/*/man3/libuuid.3
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/*/man3/uuid_*.3
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/*/man8/findfs.8
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/*/man8/fsck.8
 
 %if %{with nls}
 [ "`file $RPM_BUILD_ROOT%{_datadir}/locale/it/LC_MESSAGES/e2fsprogs.mo |\
@@ -760,16 +732,12 @@ echo '.so mke2fs.8' > $RPM_BUILD_ROOT%{_mandir}/pl/man8/mkfs.ext4dev.8
 %endif
 
 rm -f $RPM_BUILD_ROOT%{_mandir}/README.e2fsprogs-non-english-man-pages
-touch $RPM_BUILD_ROOT%{_sysconfdir}/blkid.tab
 
 %if %{with initrd}
-install initrd-blkid $RPM_BUILD_ROOT/sbin/initrd-blkid
-install initrd-e2fsck $RPM_BUILD_ROOT/sbin/initrd-e2fsck
-install initrd-mke2fs $RPM_BUILD_ROOT/sbin/initrd-mke2fs
+install -d $RPM_BUILD_ROOT%{_libdir}/initrd
+install initrd-mke2fs $RPM_BUILD_ROOT%{_libdir}/initrd/mke2fs
 %endif
 
-%{?with_dietlibc:install diet-libuuid.a $RPM_BUILD_ROOT%{dietlibdir}/libuuid.a}
-
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -791,41 +759,20 @@ rm -rf $RPM_BUILD_ROOT
 %post	-n libcom_err -p /sbin/ldconfig
 %postun	-n libcom_err -p /sbin/ldconfig
 
-%post	-n libuuid -p /sbin/ldconfig
-%postun	-n libuuid -p /sbin/ldconfig
-
-%pre	-n uuidd
-if [ "$(getgid libuuid 2>/dev/null)" = "222" ]; then
-	/usr/sbin/groupmod -n uuidd libuuid
-fi
-%groupadd -g 222 uuidd
-if [ "$(id -u libuuid 2>/dev/null)" = "222" ]; then
-	/usr/sbin/usermod -l uuidd libuuid
-fi
-%useradd -u 222 -r -d /var/lib/libuuid -s /bin/false -c "UUID generator helper daemon" -g uuidd uuidd
-
-%postun	-n uuidd
-if [ "$1" = "0" ]; then
-	%userremove uuidd
-	%groupremove uuidd
-fi
-
-%post	-n fsck -p /sbin/ldconfig
-%postun	-n fsck -p /sbin/ldconfig
+%post	-n libss -p /sbin/ldconfig
+%postun	-n libss -p /sbin/ldconfig
 
 %files %{?with_nls:-f %{name}.lang}
 %defattr(644,root,root,755)
 # COPYING specifies license details for some parts of package
 %doc COPYING README RELEASE-NOTES
 %attr(755,root,root) /sbin/badblocks
-%attr(755,root,root) /sbin/blkid
 %attr(755,root,root) /sbin/debugfs
 %attr(755,root,root) /sbin/dumpe2fs
 %attr(755,root,root) /sbin/e2fsck
 %attr(755,root,root) /sbin/e2image
 %attr(755,root,root) /sbin/e2label
 %attr(755,root,root) /sbin/e2undo
-%attr(755,root,root) /sbin/findfs
 %attr(755,root,root) /sbin/fsck.ext2
 %attr(755,root,root) /sbin/fsck.ext3
 %attr(755,root,root) /sbin/fsck.ext4
@@ -840,28 +787,25 @@ fi
 %attr(755,root,root) /sbin/tune2fs
 %attr(755,root,root) %{_bindir}/chattr
 %attr(755,root,root) %{_bindir}/lsattr
-%attr(755,root,root) %{_bindir}/mk_cmds
+%attr(755,root,root) %{_sbindir}/e2freefrag
 %attr(755,root,root) %{_sbindir}/filefrag
 %attr(755,root,root) %{_sbindir}/mklost+found
 %attr(755,root,root) %{_libdir}/e2initrd_helper
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/e2fsck.conf
 %config(noreplace) %verify(not md5 mtime size) %{_sysconfdir}/mke2fs.conf
-%ghost %{_sysconfdir}/blkid.tab
 %{_mandir}/man1/chattr.1*
 %{_mandir}/man1/lsattr.1*
-%{_mandir}/man1/mk_cmds.1*
 %{_mandir}/man5/e2fsck.conf.5*
 %{_mandir}/man5/mke2fs.conf.5*
 %{_mandir}/man8/badblocks.8*
-%{_mandir}/man8/blkid.8*
 %{_mandir}/man8/debugfs.8*
 %{_mandir}/man8/dumpe2fs.8*
+%{_mandir}/man8/e2freefrag.8*
 %{_mandir}/man8/e2fsck.8*
 %{_mandir}/man8/e2image.8*
 %{_mandir}/man8/e2label.8*
 %{_mandir}/man8/e2undo.8*
 %{_mandir}/man8/filefrag.8*
-%{_mandir}/man8/findfs.8*
 %{_mandir}/man8/fsck.ext2.8*
 %{_mandir}/man8/fsck.ext3.8*
 %{_mandir}/man8/fsck.ext4.8*
@@ -916,7 +860,6 @@ fi
 %lang(ja) %{_mandir}/ja/man8/e2fsck.8*
 %lang(ja) %{_mandir}/ja/man8/e2image.8*
 %lang(ja) %{_mandir}/ja/man8/e2label.8*
-%lang(ja) %{_mandir}/ja/man8/findfs.8*
 %lang(ja) %{_mandir}/ja/man8/fsck.ext2.8*
 %lang(ja) %{_mandir}/ja/man8/fsck.ext3.8*
 %lang(ja) %{_mandir}/ja/man8/fsck.ext4.8*
@@ -964,48 +907,34 @@ fi
 %lang(pl) %{_mandir}/pl/man8/mkfs.ext4dev.8*
 %lang(pl) %{_mandir}/pl/man8/mklost+found.8*
 %lang(pl) %{_mandir}/pl/man8/tune2fs.8*
-%{_datadir}/ss
 %{_infodir}/e2compr.info*
 
 %if %{without allstatic}
 %files libs
 %defattr(644,root,root,755)
-%attr(755,root,root) /%{_lib}/libblkid.so.*.*
-%attr(755,root,root) %ghost /%{_lib}/libblkid.so.1
 %attr(755,root,root) /%{_lib}/libe2p.so.*.*
 %attr(755,root,root) %ghost /%{_lib}/libe2p.so.2
 %attr(755,root,root) /%{_lib}/libext2fs.so.*.*
 %attr(755,root,root) %ghost /%{_lib}/libext2fs.so.2
-%attr(755,root,root) /%{_lib}/libss.so.*.*
-%attr(755,root,root) %ghost /%{_lib}/libss.so.2
 %endif
 
 %files devel
 %defattr(644,root,root,755)
-%doc doc/libblkid.txt
 %if %{without allstatic}
-%attr(755,root,root) %{_libdir}/libblkid.so
 %attr(755,root,root) %{_libdir}/libe2p.so
 %attr(755,root,root) %{_libdir}/libext2fs.so
 %attr(755,root,root) %{_libdir}/libss.so
 %endif
-%{_includedir}/blkid
 %{_includedir}/e2p
 %{_includedir}/ext2fs
-%{_includedir}/ss
-%{_pkgconfigdir}/blkid.pc
 %{_pkgconfigdir}/e2p.pc
 %{_pkgconfigdir}/ext2fs.pc
-%{_pkgconfigdir}/ss.pc
 %{_infodir}/libext2fs.info*
-%{_mandir}/man3/libblkid.3*
 
 %files static
 %defattr(644,root,root,755)
-%{_libdir}/libblkid.a
 %{_libdir}/libe2p.a
 %{_libdir}/libext2fs.a
-%{_libdir}/libss.a
 
 %files -n libcom_err
 %defattr(644,root,root,755)
@@ -1030,53 +959,30 @@ fi
 %defattr(644,root,root,755)
 %{_libdir}/libcom_err.a
 
-%files -n libuuid
-%defattr(644,root,root,755)
-%doc lib/uuid/COPYING
-%attr(755,root,root) %{_bindir}/uuidgen
 %if %{without allstatic}
-%attr(755,root,root) /%{_lib}/libuuid.so.*.*
-%attr(755,root,root) %ghost /%{_lib}/libuuid.so.1
-%endif
-%{_mandir}/man1/uuidgen.1*
-%lang(ja) %{_mandir}/ja/man1/uuidgen.1*
-
-%files -n libuuid-devel
+%files -n libss
 %defattr(644,root,root,755)
-%{!?with_allstatic:%attr(755,root,root) %{_libdir}/libuuid.so}
-%{_includedir}/uuid
-%{_pkgconfigdir}/uuid.pc
-%{_mandir}/man3/uuid*.3*
-%lang(ja) %{_mandir}/ja/man3/libuuid.3*
-%lang(ja) %{_mandir}/ja/man3/uuid_*.3*
-
-%files -n libuuid-static
-%defattr(644,root,root,755)
-%{_libdir}/libuuid.a
-
-%if %{with dietlibc}
-%files -n libuuid-dietlibc
-%defattr(644,root,root,755)
-%{dietlibdir}/libuuid.a
+%attr(755,root,root) /%{_lib}/libss.so.*.*
+%attr(755,root,root) %ghost /%{_lib}/libss.so.2
 %endif
 
-%files -n uuidd
+%files -n libss-devel
 %defattr(644,root,root,755)
-%attr(6755,uuidd,uuidd) %{_sbindir}/uuidd
-%attr(2775,uuidd,uuidd) /var/lib/libuuid
-%{_mandir}/man8/uuidd.8*
+%attr(755,root,root) %{_bindir}/mk_cmds
+%if %{without allstatic}
+%attr(755,root,root) %{_libdir}/libss.so
+%endif
+%{_includedir}/ss
+%{_datadir}/ss
+%{_pkgconfigdir}/ss.pc
+%{_mandir}/man1/mk_cmds.1*
 
-%files -n fsck
+%files -n libss-static
 %defattr(644,root,root,755)
-%attr(755,root,root) /sbin/fsck
-%{_mandir}/man8/fsck.8*
-%lang(it) %{_mandir}/it/man8/fsck.8*
-%lang(ja) %{_mandir}/ja/man8/fsck.8*
-%lang(ko) %{_mandir}/ko/man8/fsck.8*
-%lang(pl) %{_mandir}/pl/man8/fsck.8*
+%{_libdir}/libss.a
 
 %if %{with initrd}
 %files initrd
 %defattr(644,root,root,755)
-%attr(755,root,root) /sbin/initrd-*
+%attr(755,root,root) %{_libdir}/initrd/mke2fs
 %endif