Pisilinux/core
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

util-linux: clean unneeded conflicts..

Browse Source
This commit is contained in:
suvari
2016-03-20 00:01:54 +02:00
parent 5635239f81
commit 29b2273272
1 changed files with 0 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
system/base/util-linux/pspec.xml
-20
View File
@@ -1,4 +1,3 @@
<?xml version="1.0" ?> <?xml version="1.0" ?>
<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd"> <!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
<PISI> <PISI>
@@ -48,9 +47,6 @@
<!--<Dependency>utempter</Dependency>--> <!--<Dependency>utempter</Dependency>-->
<Dependency>libcap-ng</Dependency> <Dependency>libcap-ng</Dependency>
</RuntimeDependencies> </RuntimeDependencies>
<Conflicts>
<Package releaseTo="8">util-linux</Package>
</Conflicts>
<Files> <Files>
<Path fileType="config">/etc</Path> <Path fileType="config">/etc</Path>
<Path fileType="executable">/bin</Path> <Path fileType="executable">/bin</Path>
@@ -76,9 +72,6 @@
<RuntimeDependencies> <RuntimeDependencies>
<Dependency>libutil-linux</Dependency> <Dependency>libutil-linux</Dependency>
</RuntimeDependencies> </RuntimeDependencies>
<Conflicts>
<Package releaseTo="8">uuidd</Package>
</Conflicts>
<!-- FIXME: Add COMAR service --> <!-- FIXME: Add COMAR service -->
<Files> <Files>
<Path fileType="executable">/usr/bin/uuidgen</Path> <Path fileType="executable">/usr/bin/uuidgen</Path>
@@ -99,10 +92,6 @@
<RuntimeDependencies> <RuntimeDependencies>
<Dependency>python</Dependency> <Dependency>python</Dependency>
</RuntimeDependencies> </RuntimeDependencies>
<Conflicts>
<Package releaseTo="8">libblkid</Package>
<Package releaseTo="8">libuuid</Package>
</Conflicts>
<Replaces> <Replaces>
<Package>libblkid</Package> <Package>libblkid</Package>
<Package>libuuid</Package> <Package>libuuid</Package>
@@ -113,7 +102,6 @@
<Path fileType="man">/usr/share/man/man3/uuid*</Path> <Path fileType="man">/usr/share/man/man3/uuid*</Path>
<Path fileType="man">/usr/share/man/man3/libblkid*</Path> <Path fileType="man">/usr/share/man/man3/libblkid*</Path>
<Path fileType="man">/usr/share/man/man8/blkid*</Path> <Path fileType="man">/usr/share/man/man8/blkid*</Path>
</Files> </Files>
</Package> </Package>
@@ -125,10 +113,6 @@
<RuntimeDependencies> <RuntimeDependencies>
<Dependency release="current">libutil-linux</Dependency> <Dependency release="current">libutil-linux</Dependency>
</RuntimeDependencies> </RuntimeDependencies>
<Conflicts>
<Package releaseTo="8">libblkid-devel</Package>
<Package releaseTo="8">libuuid-devel</Package>
</Conflicts>
<Replaces> <Replaces>
<Package>libblkid-devel</Package> <Package>libblkid-devel</Package>
<Package>libuuid-devel</Package> <Package>libuuid-devel</Package>
@@ -147,10 +131,6 @@
<RuntimeDependencies> <RuntimeDependencies>
<Dependency>glibc-32bit</Dependency> <Dependency>glibc-32bit</Dependency>
</RuntimeDependencies> </RuntimeDependencies>
<Conflicts>
<Package releaseTo="8">libblkid-32bit</Package>
<Package releaseTo="8">libuuid-32bit</Package>
</Conflicts>
<Replaces> <Replaces>
<Package>libblkid-32bit</Package> <Package>libblkid-32bit</Package>
<Package>libuuid-32bit</Package> <Package>libuuid-32bit</Package>