Changeset 1528 for spec/trunk/SPECS/libiconv.spec

Timestamp:

Nov 21, 2018, 4:09:35 PM (7 years ago)

Author:

Silvan Scherrer

Message:

flush more local changes, all minor which don't qualify for a new rpm

File:

• spec/trunk/SPECS/libiconv.spec (modified) (5 diffs)

spec/trunk/SPECS/libiconv.spec

@@ -11 +11 @@
 URL:            https://www.gnu.org/software/libiconv/
 Vendor:         bww bitwise works GmbH
-#scm_source github https://github.com/bitwiseworks/%{name}-os2 %{version}-os2
-%scm_source git file://e:/Trees/libiconv/git master-os2
+%scm_source github https://github.com/bitwiseworks/%{name}-os2 %{version}-os2
+#%scm_source git file://e:/Trees/libiconv/git master-os2
 
 BuildRequires:  autoconf >= 2.60
 BuildRequires:  automake
 BuildRequires:  libtool
+
+# for the password stuff, as a private repo
+BuildRequires: os2-rpm-build >= 1-4
 
 %description
@@ -31 +34 @@
 %description devel
 This package contains libiconv header files.
-%endif
 
 %package static
@@ -40 +42 @@
 %description static
 This package contains static libiconv library.
+%endif
 
 
@@ -84 +87 @@
 rm -f $RPM_BUILD_ROOT/%{_mandir}/man3/iconv*.3*
 rm -f $RPM_BUILD_ROOT/%{_docdir}/iconv*.html
+rm -f $RPM_BUILD_ROOT/%{_libdir}/charset.a
 %endif
 
@@ -107 +111 @@
 %{_mandir}/man3/iconv*.3*
 %{_docdir}/iconv*.html
-%endif
 
 %files static
 %defattr(644,root,root,755)
 %{_libdir}/charset.a
+%endif
 
 %files utils