Page Menu
Home
Solus
Search
Configure Global Search
Log In
Files
F11052969
D1260.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
6 KB
Referenced Files
None
Subscribers
None
D1260.diff
View Options
diff --git a/actions.py b/actions.py
deleted file mode 100644
--- a/actions.py
+++ /dev/null
@@ -1,12 +0,0 @@
-
-#!/usr/bin/python
-
-
-from pisi.actionsapi import shelltools, get, autotools, pisitools
-
-#def build():
-# autotools.make('-j1')
-
-def install():
- autotools.rawInstall("DESTDIR=%s" % get.installDIR())
- pisitools.dodoc ("COPYING", "BUGS", "README")
diff --git a/component.xml b/component.xml
deleted file mode 100644
--- a/component.xml
+++ /dev/null
@@ -1,3 +0,0 @@
-<PISI>
- <Name>programming.tools</Name>
-</PISI>
diff --git a/files/fix-install-paths.patch b/files/fix-install-paths.patch
deleted file mode 100644
--- a/files/fix-install-paths.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -ruNb a/Makefile b/Makefile
---- a/Makefile 2012-10-17 16:14:35.000000000 -0400
-+++ b/Makefile 2013-06-11 19:57:11.843632903 -0400
-@@ -1,6 +1,6 @@
--INSTALL_DIR=/usr/local/bin
--MAN_DIR=/usr/local/man/man1
--ETC_DIR=/etc
-+INSTALL_DIR=/usr/bin
-+MAN_DIR=/usr/share/man/man1
-+ETC_DIR=/etc/colordiff
- VERSION=$(shell egrep '^my .version' colordiff.pl |cut -f 2 -d "'")
- DIST_FILES=COPYING INSTALL Makefile README \
- colordiff.pl colordiffrc colordiffrc-lightbg cdiff.sh BUGS CHANGES colordiff.1 \
-@@ -35,13 +35,23 @@
- else \
- install -d ${DESTDIR}${ETC_DIR}; \
- fi
-+ if [ -f ${DESTDIR}${ETC_DIR}/colordiffrc-lightbg ]; then \
-+ mv -f ${DESTDIR}${ETC_DIR}/colordiffrc-lightbg \
-+ ${DESTDIR}${ETC_DIR}/colordiffrc-lightbg.old; \
-+ else \
-+ install -d ${DESTDIR}${ETC_DIR}; \
-+ fi
- cp colordiffrc ${DESTDIR}${ETC_DIR}/colordiffrc
-+ cp colordiffrc-lightbg ${DESTDIR}${ETC_DIR}/colordiffrc-lightbg
- -chown root.root ${DESTDIR}${ETC_DIR}/colordiffrc
-+ -chown root.root ${DESTDIR}${ETC_DIR}/colordiffrc-lightbg
- chmod 644 ${DESTDIR}${ETC_DIR}/colordiffrc
-+ chmod 644 ${DESTDIR}${ETC_DIR}/colordiffrc-lightbg
-
- uninstall:
- rm -f ${DESTDIR}${INSTALL_DIR}/colordiff
- rm -f ${DESTDIR}${ETC_DIR}/colordiffrc
-+ rm -f ${DESTDIR}${ETC_DIR}/colordiffrc-lightbg
- rm -f ${DESTDIR}${INSTALL_DIR}/cdiff
- rm -f ${DESTDIR}${MAN_DIR}/colordiff.1
- rm -f ${DESTDIR}${MAN_DIR}/cdiff.1
diff --git a/package.yml b/package.yml
new file mode 100644
--- /dev/null
+++ b/package.yml
@@ -0,0 +1,27 @@
+name : colordiff
+version : 1.0.18
+release : 2
+source :
+ - https://www.colordiff.org/colordiff-1.0.18.tar.gz : 29cfecd8854d6e19c96182ee13706b84622d7b256077df19fbd6a5452c30d6e0
+license : GPL-2.0
+component : programming.tools
+summary : Colorized diff output
+description: |
+ Colordiff is a Perl script that is a wrapper for diff and allows for syntax highlighting in diffs.
+builddeps :
+ - xmlto
+ - diffutils
+ - docbook-xml
+ - w3m
+rundeps :
+ - diffutils
+build : |
+ %make
+install : |
+ install -D -m 00755 $workdir/colordiff.pl $installdir/usr/bin/colordiff
+ install -D -m 00755 $workdir/cdiff.sh $installdir/usr/bin/cdiff
+ install -D -m 00644 $workdir/colordiff.1 $installdir/usr/share/man/man1/colordiff.1
+ install -D -m 00644 $workdir/cdiff.1 $installdir/usr/share/man/man1/cdiff.1
+ install -D -m 00644 $workdir/colordiffrc $installdir/usr/share/doc/colordiff/colordiffrc
+ install -D -m 00644 $workdir/colordiffrc-gitdiff $installdir/usr/share/doc/colordiff/colordiffrc-gitdiff
+ install -D -m 00644 $workdir/colordiffrc-lightbg $installdir/usr/share/doc/colordiff/colordiffrc-lightbg
\ No newline at end of file
diff --git a/pspec.xml b/pspec.xml
deleted file mode 100644
--- a/pspec.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" ?>
-<!DOCTYPE PISI SYSTEM "http://www.solusos.com/standard/pisi-spec.dtd">
-<PISI>
- <Source>
- <Name>colordiff</Name>
- <Homepage>http://www.colordiff.org</Homepage>
- <Packager>
- <Name>Justin Krehel</Name>
- <Email>justin@solusos.com</Email>
- </Packager>
- <Summary>Colorized diff output</Summary>
- <Description>Colordiff is a Perl script that is a wrapper for diff and allows for syntax highlighting in diffs.</Description>
- <License>GPLv2+</License>
- <Archive sha1sum="64e369aed2230f3aa5f1510b231fcac270793c09" type="targz">http://www.colordiff.org/colordiff-1.0.13.tar.gz</Archive>
- <BuildDependencies>
- <Dependency>diffutils</Dependency>
- <Dependency>xmlto</Dependency>
- </BuildDependencies>
- <Patches>
- <Patch level="1">fix-install-paths.patch</Patch>
- </Patches>
- </Source>
-
- <Package>
- <Name>colordiff</Name>
- <RuntimeDependencies>
- <Dependency>xmlto</Dependency>
- <Dependency>diffutils</Dependency>
- </RuntimeDependencies>
- <Files>
- <Path fileType="config">/etc/colordiff</Path>
- <Path fileType="executable">/usr/bin</Path>
- <Path fileType="doc">/usr/share/doc</Path>
- <Path fileType="man">/usr/share/man</Path>
- </Files>
- </Package>
-
- <History>
- <Update release="1">
- <Date>06-11-2013</Date>
- <Version>1.0.13</Version>
- <Comment>Add colordiff to repositories</Comment>
- <Name>Justin Krehel</Name>
- <Email>justin@solusos.com</Email>
- </Update>
- </History>
-
-</PISI>
-
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
new file mode 100644
--- /dev/null
+++ b/pspec_x86_64.xml
@@ -0,0 +1,36 @@
+<PISI>
+ <Source>
+ <Name>colordiff</Name>
+ <Packager>
+ <Name>Matthew Andersen</Name>
+ <Email>matthew@barelystable.com</Email>
+ </Packager>
+ <License>GPL-2.0</License>
+ <PartOf>programming.tools</PartOf>
+ <Summary xml:lang="en">Colorized diff output</Summary>
+ <Description xml:lang="en">Colordiff is a Perl script that is a wrapper for diff and allows for syntax highlighting in diffs.
+</Description>
+ <Archive type="binary" sha1sum="79eb0752a961b8e0d15c77d298c97498fbc89c5a">https://solus-project.com/sources/README.Solus</Archive>
+ </Source>
+ <Package>
+ <Name>colordiff</Name>
+ <Summary xml:lang="en">Colorized diff output</Summary>
+ <Description xml:lang="en">Colordiff is a Perl script that is a wrapper for diff and allows for syntax highlighting in diffs.
+</Description>
+ <PartOf>programming.tools</PartOf>
+ <Files>
+ <Path fileType="executable">/usr/bin</Path>
+ <Path fileType="doc">/usr/share/doc</Path>
+ <Path fileType="man">/usr/share/man</Path>
+ </Files>
+ </Package>
+ <History>
+ <Update release="2">
+ <Date>2017-10-27</Date>
+ <Version>1.0.18</Version>
+ <Comment>Packaging update</Comment>
+ <Name>Matthew Andersen</Name>
+ <Email>matthew@barelystable.com</Email>
+ </Update>
+ </History>
+</PISI>
\ No newline at end of file
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Fri, Aug 11, 10:21 PM (2 h, 57 m ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
5803885
Default Alt Text
D1260.diff (6 KB)
Attached To
Mode
D1260: Update to 1.0.18
Attached
Detach File
Event Timeline
Log In to Comment