commit 560704e9773efb9fde4b41518ba4ce891a4b0193
Author: Szymon Siwek <[email protected]>
Date: Thu Feb 19 16:36:17 2015 +0100
removed obsolete patches; rel. 1
units-FHS.patch | 47 -----------------------------------------------
units-info.patch | 17 -----------------
units.spec | 10 +++-------
3 files changed, 3 insertions(+), 71 deletions(-)
---
diff --git a/units.spec b/units.spec
index eddfa99..33f52a7 100644
--- a/units.spec
+++ b/units.spec
@@ -9,14 +9,12 @@ Summary(tr.UTF-8): Birim dönüştürme programı
Summary(uk.UTF-8): Утиліта для конвертації одиниць виміру
Name: units
Version: 2.11
-Release: 0.1
+Release: 1
License: GPL
Group: Applications/Engineering
Source0: ftp://ftp.gnu.org/pub/gnu/units/%{name}-%{version}.tar.gz
# Source0-md5: 1d83f4e68135495aa9267b848de78dc5
-Patch0: %{name}-info.patch
-Patch1: %{name}-FHS.patch
-Patch2: %{name}-use_sys_getopt.patch
+Patch0: %{name}-use_sys_getopt.patch
BuildRequires: autoconf
BuildRequires: automake
BuildRequires: readline-devel >= 4.2
@@ -91,9 +89,7 @@ units programı, çeşitli birimlerdeki büyüklükleri başka
birimlere
%prep
%setup -q
-#patch0 -p1
-#patch1 -p1
-%patch2 -p1
+%patch0 -p1
%build
%{__aclocal}
diff --git a/units-FHS.patch b/units-FHS.patch
deleted file mode 100644
index e17580d..0000000
--- a/units-FHS.patch
+++ /dev/null
@@ -1,47 +0,0 @@
---- units-1.88/Makefile.in.orig 2008-04-22 13:07:04.000000000 +0200
-+++ units-1.88/Makefile.in 2010-02-16 13:35:38.000000000 +0100
-@@ -44,7 +44,7 @@
-
- transform=@program_transform_name@
-
--DEFS = -DUNITSFILE=\"@[email protected]\" @DEFIS@ @DEFS@
-+DEFS = -DUNITSFILE=\"$(datadir)/misc/units.dat\" @DEFIS@ @DEFS@
- CFLAGS = @CFLAGS@
- OBJECTS = units.@OBJEXT@ parse.tab.@OBJEXT@ getopt.@OBJEXT@ getopt1.@OBJEXT@
@STRFUNC@
-
-@@ -78,14 +78,14 @@
- $(CC) $(LDFLAGS) -o units $(OBJECTS) $(LIBS)
-
- install: units@EXEEXT@ units.dat install-doc
-- $(srcdir)/mkinstalldirs $(DESTDIR)$(bindir) $(DESTDIR)$(datadir)
-+ $(srcdir)/mkinstalldirs $(DESTDIR)$(bindir) $(DESTDIR)$(datadir)/misc
- $(INSTALL_PROGRAM) units $(DESTDIR)$(bindir)/`echo units|sed
'$(transform)'`
-- $(INSTALL_DATA) $(srcdir)/units.dat $(DESTDIR)$(datadir)/units.dat
-+ $(INSTALL_DATA) $(srcdir)/units.dat $(DESTDIR)$(datadir)/misc/units.dat
-
- install-strip: units@EXEEXT@ units.dat install-doc
- $(srcdir)/mkinstalldirs $(DESTDIR)$(bindir) $(DESTDIR)$(datadir)
- $(INSTALL_PROGRAM) -s units $(DESTDIR)$(bindir)/`echo units|sed
'$(transform)'`
-- $(INSTALL_DATA) $(srcdir)/units.dat $(DESTDIR)$(datadir)/units.dat
-+ $(INSTALL_DATA) $(srcdir)/units.dat $(DESTDIR)$(datadir)/misc/units.dat
-
- install-doc: install-man install-info
-
-@@ -97,7 +97,7 @@
- ./texi2man units.texinfo > units.man
-
- units.1: units.man
-- sed s!@DATAFILE@!@[email protected]! $(srcdir)/units.man > units.1
-+ sed s!@DATAFILE@!$(datadir)/misc/units.dat! $(srcdir)/units.man >
units.1
-
- install-info: $(DESTDIR)$(infodir)/units.info
-
-@@ -127,7 +127,7 @@
- uninstall:
- -rm -f $(DESTDIR)$(bindir)/`echo units|sed '$(transform)'` \
- $(DESTDIR)$(mandir)/man1/`echo units|sed '$(transform)'`.1 \
-- $(DESTDIR)$(infodir)/units.info $(DESTDIR)$(datadir)/units.dat
-+ $(DESTDIR)$(infodir)/units.info
$(DESTDIR)$(DESTDIR)$(datadir)/misc/units.dat
- @if test -f $(DESTDIR)$(infodir)/dir; then \
- echo You may need to remove units.info from $(DESTDIR)$(infodir)/dir;
\
- else true; fi
diff --git a/units-info.patch b/units-info.patch
deleted file mode 100644
index bf86bd3..0000000
--- a/units-info.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -Nru units-1.55/units.texinfo units-1.55.new/units.texinfo
---- units-1.55/units.texinfo Fri Jul 30 23:27:52 1999
-+++ units-1.55.new/units.texinfo Wed Jul 26 21:12:24 2000
-@@ -14,9 +14,10 @@
- @c noman
- @ifinfo
- @format
--START-INFO-DIR-ENTRY
--* units: (units). Units conversion.
--END-INFO-DIR-ENTRY
-+@dircategory Miscellaneous:
-+@direntry
-+* units: (units). Units conversion
-+@end direntry
- @end format
- @end ifinfo
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/units.git/commitdiff/560704e9773efb9fde4b41518ba4ce891a4b0193
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
