comparison: openpkg/rpm.patch.feature
openpkg/rpm.patch.feature
- changeset 427
- 71503088f51b
- parent 336
- fa72b60f59c9
equal
deleted
inserted
replaced
| 2:058eda99fa36 | 3:432743cc811a |
|---|---|
| 56 @@ -124,32 +121,32 @@ | 56 @@ -124,32 +121,32 @@ |
| 57 pkgsrcdir = $(prefix)/src/$(RPMCANONVENDOR) | 57 pkgsrcdir = $(prefix)/src/$(RPMCANONVENDOR) |
| 58 | 58 |
| 59 install-data-local: | 59 install-data-local: |
| 60 - @$(mkinstalldirs) $(DESTDIR)$(varprefix)/lib/rpm | 60 - @$(mkinstalldirs) $(DESTDIR)$(varprefix)/lib/rpm |
| 61 + @$(mkinstalldirs) $(DESTDIR)$(varprefix)/lib/openpkg | 61 + @$(mkinstalldirs) $(DESTDIR)$(libdir)/openpkg |
| 62 @rm -f $(DESTDIR)$(libdir)/rpmrc | 62 @rm -f $(DESTDIR)$(libdir)/rpmrc |
| 63 @@LN_S@ rpm/rpmrc $(DESTDIR)$(libdir)/rpmrc | 63 @@LN_S@ rpm/rpmrc $(DESTDIR)$(libdir)/rpmrc |
| 64 @rm -f $(DESTDIR)$(libdir)/rpmpopt | 64 @rm -f $(DESTDIR)$(libdir)/rpmpopt |
| 65 @@LN_S@ rpm/rpmpopt $(DESTDIR)$(libdir)/rpmpopt | 65 @@LN_S@ rpm/rpmpopt $(DESTDIR)$(libdir)/rpmpopt |
| 66 @rm -f $(DESTDIR)$(libdir)/rpm/rpmt | 66 @rm -f $(DESTDIR)$(libdir)/rpm/rpmt |
| 182 @@ -1097,32 +1095,32 @@ | 182 @@ -1097,32 +1095,32 @@ |
| 183 `make -s sources -C popt` | 183 `make -s sources -C popt` |
| 184 | 184 |
| 185 install-data-local: | 185 install-data-local: |
| 186 - @$(mkinstalldirs) $(DESTDIR)$(varprefix)/lib/rpm | 186 - @$(mkinstalldirs) $(DESTDIR)$(varprefix)/lib/rpm |
| 187 + @$(mkinstalldirs) $(DESTDIR)$(varprefix)/lib/openpkg | 187 + @$(mkinstalldirs) $(DESTDIR)$(libdir)/openpkg |
| 188 @rm -f $(DESTDIR)$(libdir)/rpmrc | 188 @rm -f $(DESTDIR)$(libdir)/rpmrc |
| 189 @@LN_S@ rpm/rpmrc $(DESTDIR)$(libdir)/rpmrc | 189 @@LN_S@ rpm/rpmrc $(DESTDIR)$(libdir)/rpmrc |
| 190 @rm -f $(DESTDIR)$(libdir)/rpmpopt | 190 @rm -f $(DESTDIR)$(libdir)/rpmpopt |
| 191 @@LN_S@ rpm/rpmpopt $(DESTDIR)$(libdir)/rpmpopt | 191 @@LN_S@ rpm/rpmpopt $(DESTDIR)$(libdir)/rpmpopt |
| 192 - @rm -f $(DESTDIR)$(libdir)/rpm/rpmt | 192 - @rm -f $(DESTDIR)$(libdir)/rpm/rpmt |
| 1932 +--------------------------------------------------------------------------- | 1932 +--------------------------------------------------------------------------- |
| 1933 | Add support for the OpenPKG custom .spec file sections %track | 1933 | Add support for the OpenPKG custom .spec file sections %track |
| 1934 | (package build-time feature for performing vendor source tracking) | 1934 | (package build-time feature for performing vendor source tracking) |
| 1935 | and %test (package install-time feature for performing package | 1935 | and %test (package install-time feature for performing package |
| 1936 | run-time tests). | 1936 | run-time tests). |
| 1937 | | |
| 1938 | MSvB: Additionally provide a default %clean section, removing buildroot. | |
| 1937 +--------------------------------------------------------------------------- | 1939 +--------------------------------------------------------------------------- |
| 1938 Index: build/parseSpec.c | 1940 Index: build/parseSpec.c |
| 1939 --- build/parseSpec.c 15 May 2003 13:38:57 -0000 1.1.1.15 | 1941 --- build/parseSpec.c 15 May 2003 13:38:57 -0000 1.1.1.15 |
| 1940 +++ build/parseSpec.c 30 Jan 2004 17:06:30 -0000 1.2 | 1942 +++ build/parseSpec.c 30 Jan 2004 17:06:30 -0000 1.2 |
| 1941 @@ -43,6 +43,10 @@ | 1943 @@ -43,6 +43,10 @@ |
| 1963 +#endif | 1965 +#endif |
| 1964 + | 1966 + |
| 1965 case PART_NONE: /* XXX avoid gcc whining */ | 1967 case PART_NONE: /* XXX avoid gcc whining */ |
| 1966 case PART_LAST: | 1968 case PART_LAST: |
| 1967 case PART_BUILDARCHITECTURES: | 1969 case PART_BUILDARCHITECTURES: |
| 1970 @@ -576,6 +589,13 @@ | |
| 1971 } | |
| 1972 /*@=infloops@*/ /* LCL: parsePart is modified @*/ | |
| 1973 | |
| 1974 + if (spec->clean == NULL) { | |
| 1975 + char *body = rpmExpand("%{?buildroot: %{__rm} -rf %{buildroot}}", NULL); | |
| 1976 + spec->clean = newStringBuf(); | |
| 1977 + appendLineStringBuf(spec->clean, body); | |
| 1978 + free(body); | |
| 1979 + } | |
| 1980 + | |
| 1981 /* Check for description in each package and add arch and os */ | |
| 1982 { | |
| 1983 #ifdef DYING | |
| 1968 | 1984 |
| 1969 +--------------------------------------------------------------------------- | 1985 +--------------------------------------------------------------------------- |
| 1970 | Add support for the OpenPKG custom .spec file sections %track | 1986 | Add support for the OpenPKG custom .spec file sections %track |
| 1971 | (package build-time feature for performing vendor source tracking) | 1987 | (package build-time feature for performing vendor source tracking) |
| 1972 | and %test (package install-time feature for performing package | 1988 | and %test (package install-time feature for performing package |
